Commit Graph

873 Commits

Author SHA1 Message Date
Josh Berman
ca25c0dc16 Merge remote-tracking branch 'upstream/master' into es5
Conflicts:
	stack-8.0.yaml
	tests/tests.hs
2016-12-01 14:57:41 +02:00
Josh Berman
437bc3d16f Elastic 5.0 compatibility
This commit moves bloodhound library to use elastic 5.0.
The filter type was changes to be a wrapper for queries, and some
new APIs are met.

It is *not* feture-complete, however, all tests pass.
2016-11-29 13:18:01 +02:00
Chris Allen
f564d795c6 Merge pull request #156 from bitemyapp/next-release
Prepare for 0.12.0.0 release.
2016-11-22 18:32:33 -06:00
Michael Xavier
8c5392424b Prepare for 0.12.0.0 release. 2016-11-22 15:12:34 -08:00
Chris Allen
ef74b99ebf Merge pull request #155 from phadej/drop-derive
Switch derive to generics-sop
2016-11-22 15:26:53 -06:00
Oleg Grenrus
6003d8a967 Test with GHC8.0 on travis 2016-11-18 19:43:04 +02:00
Oleg Grenrus
3534c68f2e Switch derive to generics-sop
Until https://github.com/nick8325/quickcheck/pull/112 is merged and
released
2016-11-18 19:43:04 +02:00
Oleg Grenrus
4170273805 Switch derive to generics-sop
Until https://github.com/nick8325/quickcheck/pull/112 is merged and
released
2016-11-18 12:19:41 +02:00
Chris Allen
0ee54ec087 Merge pull request #153 from phadej/aeson-1
Relax aeson and hspec upper bounds
2016-11-17 23:10:15 -06:00
Chris Allen
828b319940 Merge pull request #154 from phadej/patch-1
Make build-type: Simple
2016-11-17 13:59:55 -06:00
Oleg Grenrus
9141f0c0db Make build-type: Simple 2016-11-17 09:10:46 +02:00
Oleg Grenrus
71339172a1 Relax aeson and hspec upper bounds
Also update stack-8.0.yaml to use newer nightly, with aeson-1.0.*
2016-11-17 09:03:32 +02:00
Chris Allen
0027a45506 Merge pull request #150 from bitemyapp/149-qc-failure
Fix quickcheck failure due to ambiguous parse
2016-11-03 17:04:23 -05:00
Chris Allen
8930ea1b44 Merge pull request #151 from andrewthad/index_status_check
add function for checking index status
2016-11-03 17:03:58 -05:00
Andrew Martin
cb915c723b add function for checking index status 2016-11-03 16:57:22 -04:00
Michael Xavier
076f69cf45 Derive typeable for older GHC 2016-11-03 10:10:30 -07:00
Michael Xavier
d93e0d51ea Fix quickcheck failure due to ambiguous parse
Due to the way node attr filters are serialized (attr name as an object
key), its possible to express a value in haskell that will parse
ambiguously. If we wanted to move the invariant into the types we could
use a map I guess but whatever.

I ran this updated test through 100,000 tests and we're all green.
2016-11-02 19:37:03 -07:00
Chris Allen
f43b7764a9 Merge pull request #147 from bitemyapp/drop-doctest-prop
Drop doctest-prop
2016-11-02 16:44:07 -05:00
Michael Xavier
00016c2838 Drop doctest-prop
AFAICT we weren't even using it anymore. We imported the function assert
and then never used it in the doctests.
2016-10-31 14:31:03 -07:00
Chris Allen
255e39e1da Merge pull request #143 from 23Skidoo/patch-1
Fix an example.
2016-10-18 12:23:52 -05:00
Mikhail Glushenkov
b1ee4dc73b Also fix doctests. 2016-10-18 08:10:07 +01:00
Mikhail Glushenkov
bc21f0beac Fix the build with QuickCheck 2.9. 2016-10-03 11:51:28 +01:00
Mikhail Glushenkov
35ceab069e Update .gitignore. 2016-10-03 11:46:08 +01:00
Mikhail Glushenkov
d046ab8fc6 Also fix tests. 2016-10-03 11:46:08 +01:00
Mikhail Glushenkov
288d0cb787 Fix an example.
No need to specify mapping name twice, since `putMapping` does `PUT
/$INDEXNAME/_mappings/$MAPPINGNAME`. In fact, specifying the mapping
name here breaks upsert semantics (you get `Root type mapping not
empty after parsing!` exception).
2016-10-03 11:46:02 +01:00
Chris Allen
6fbdfb7aaf Merge pull request #142 from 23Skidoo/patch-1
Comment out comments in the example properly.
2016-09-29 11:55:13 -05:00
Mikhail Glushenkov
ae3bb991c7 Comment out comments in the example properly. 2016-09-29 17:53:56 +01:00
Chris Allen
7d718ef3b0 Merge pull request #139 from bermanjosh/nodePluginVersion
Wrap VersionNumber and LoadAvgs in Maybe #138
2016-09-26 15:56:10 -05:00
Josh Berman
833020f0ab Update changelog for version 0.12.0.0 2016-09-26 15:53:47 +03:00
Josh Berman
313d4a7e2a bump version to 0.12 2016-09-26 15:45:21 +03:00
Josh Berman
2c79525f6f Allow VersionNumber parser to fail
Wrap the VersionNumber in a newtype MaybeNA which checks for the String
"NA" specifically, allowing for the VersionNumber parser to fail when
needed.

Also returns the load_average parser to a simpler (more correct) version.
2016-09-22 22:17:56 +03:00
Josh Berman
7ffb3d2fde Wrap VersionNumber and LoadAvgs in Maybe #138 2016-09-22 16:39:15 +03:00
Michael Xavier
bc02cc786c Merge pull request #137 from MichaelXavier/node-stats-api
Node stats api
2016-09-21 09:10:20 -07:00
Michael Xavier
86f73a12f3 Need typeable on NodeAttrFilter 2016-09-17 19:15:27 -07:00
Michael Xavier
5dc0091c05 Fix overly broad generator for nodeattrname
We'll just use alphanum characters for node attr names
2016-09-17 19:05:57 -07:00
Michael Xavier
8ccc4fc4a8 More optional fields 2016-09-17 18:25:03 -07:00
Michael Xavier
172be51b84 Turns out some disk fields are not always present 2016-09-14 19:25:12 -07:00
Michael Xavier
df27a379bb Merge branch 'master' into node-stats-api 2016-09-14 18:18:28 -07:00
Michael Xavier
8672b4f079 Wrap up types and smoke test for stats API 2016-09-14 18:15:32 -07:00
Michael Xavier
433e3bbebc WIP: more types added 2016-08-31 19:55:45 -07:00
Chris Allen
5589154aa8 Merge pull request #135 from alistair/date_improvements
Format date as dd-MM-yyyy to support stricter 2.0+
2016-08-30 10:10:50 -05:00
Alistair Bush
9b9604b8b7 Format date as dd-MM-yyyy to support stricter 2.0+ 2016-08-30 21:01:16 +12:00
Chris Allen
041579426f Merge pull request #133 from alistair/parent_child_test_fix
Fix parent child tests for 2.0.
2016-08-25 11:38:56 -05:00
Alistair Bush
a8770c09be Fix parent child tests for 2.0. 2016-08-26 00:12:10 +12:00
Chris Allen
d555cbaa49 Merge pull request #131 from alistair/cardinality_aggs
Add support for cardinality aggregations
2016-08-24 13:28:03 -05:00
Chris Allen
a0a33b882f Merge pull request #132 from alistair/es20_error_responses
Beginnings of ES2 support - status page and error handling
2016-08-24 10:42:13 -05:00
Alistair Bush
0b810f0f10 Change error parsing to support basic es20 error responses 2016-08-23 23:15:15 +12:00
Alistair Bush
99987f70a9 Support 2.0+ status page response 2016-08-23 23:15:15 +12:00
Alistair Bush
06dc6f4398 Add support for cardinality aggregations
https://www.elastic.co/guide/en/elasticsearch/reference/1.7/search-aggregations-metrics-cardinality-aggregation.html
2016-08-22 22:49:42 +12:00
Michael Xavier
976143c85a WIP node stats API 2016-08-21 14:09:21 -07:00