Commit Graph

1533 Commits

Author SHA1 Message Date
jaymode e5cd37a9af move the core artifact to provided scope
The license core artifact is currently marked as a compile dependency but it also
shaded into the plugin jar file. This causes issues because we have the same class
in multiple jars. To workaround this, the core artifact is marked as provided so that
it is not included in the published pom file.

Closes elastic/elasticsearch#54

Original commit: elastic/x-pack-elasticsearch@0d786cb965
2015-07-02 10:25:13 -04:00
Konrad Beiske 44909bdcd6 Attach zip assembly as artifact to build when deploying internally
Attaching the zip assembly as an artifact to the build will include it when deploying to maven repositories. This will in turn facilitate testing Elasticsearch snapshot versions in a Found environment. We need to to that in order to cut down the delay from a release is made until it is available on Found.

Original commit: elastic/x-pack-elasticsearch@27516c7243
2015-07-02 16:18:03 +02:00
Konrad Beiske ba9202a5de Merge pull request elastic/elasticsearch#51 from elastic/plugin-api
Refactored api for plugins into it's own module

Original commit: elastic/x-pack-elasticsearch@8136be7e53
2015-07-02 15:19:15 +02:00
Konrad Beiske 7975e56f1e Merge branch 'master' into plugin-api
Includes porting changes made to LicenseVersion in master

Original commit: elastic/x-pack-elasticsearch@2d9919487e
2015-07-02 14:43:01 +02:00
Brian Murphy a3c5292b24 [TEST] Clean up watch created by stats test.
This may have resulted in a watch being run during shutdown.

Original commit: elastic/x-pack-elasticsearch@2631690f1a
2015-07-01 13:51:09 -04:00
jaymode b7133a516a awaits fix for another test failing due to exception serialization changes
Original commit: elastic/x-pack-elasticsearch@9585a3647b
2015-07-01 09:37:47 -04:00
jaymode b3cd671d45 add awaits fix for exception serialization issue
Original commit: elastic/x-pack-elasticsearch@6c9e993a62
2015-06-30 18:55:39 -04:00
jaymode 2d71019df9 mute tests that rely on ShieldException serialization
See elastic/elasticsearch#947

Original commit: elastic/x-pack-elasticsearch@28a69c3193
2015-06-30 18:26:45 -04:00
jaymode aef47ecc47 mute the render_search_template rest tests for now
These tests trip a Shield assertion. Need to look into how to proceed in detail.

See elastic/elasticsearch#946

Original commit: elastic/x-pack-elasticsearch@b5027ce105
2015-06-30 18:25:42 -04:00
jaymode ed0aea1311 add new action and handlers from core
Original commit: elastic/x-pack-elasticsearch@457055e5d2
2015-06-30 17:57:07 -04:00
Martijn van Groningen 1fffcc9666 fix compile error due to a rename in core
Original commit: elastic/x-pack-elasticsearch@03c9032c8b
2015-06-30 18:12:25 +02:00
Konrad Beiske f3befde555 Removed unnecessary comment blocks
Original commit: elastic/x-pack-elasticsearch@fc38cc1c30
2015-06-30 14:52:51 +02:00
jaymode 480ee9cabc only load the shield plugin for remote auditing client
Currently, any plugin that is on the classpath will be loaded by the TransportClient we create
for remote audit indexing. The only plugin that should be loaded for this client is the Shield
plugin. To accomplish this, we disable loading of plugins from the classpath and specify that
the Shield plugin should be loaded.

Closes elastic/elasticsearch#941

Original commit: elastic/x-pack-elasticsearch@2bc0a8ce17
2015-06-30 06:21:54 -04:00
Robert Muir 9edfd2f0d0 remove jar hell
Original commit: elastic/x-pack-elasticsearch@205e35baf9
2015-06-30 00:59:05 -04:00
Robert Muir 3543d7874b don't depend on ant tasks in tests
Original commit: elastic/x-pack-elasticsearch@ebbc490a2e
2015-06-30 00:56:26 -04:00
Robert Muir 0325aeeb5f Don't depend on ant tasks in tests
Original commit: elastic/x-pack-elasticsearch@f5dd00f327
2015-06-30 00:55:33 -04:00
Robert Muir 7e519222ef Merge pull request elastic/elasticsearch#636 from rmuir/securemock
Use elasticsearch securemock library

Original commit: elastic/x-pack-elasticsearch@8a6b2246b8
2015-06-29 11:09:20 -04:00
Robert Muir 9380b5c050 Merge pull request elastic/elasticsearch#942 from rmuir/securemock
Use elasticsearch securemock library

Original commit: elastic/x-pack-elasticsearch@198b7ab3b1
2015-06-29 11:08:33 -04:00
Robert Muir b368916005 Use elasticsearch securemock library
Original commit: elastic/x-pack-elasticsearch@0eccff1d6b
2015-06-29 10:46:54 -04:00
Robert Muir ebd515e6ee Use elasticsearch securemock library
Original commit: elastic/x-pack-elasticsearch@b44c85ca99
2015-06-29 10:38:52 -04:00
uboness 7cec0c97df Added time zone support to DynamicIndexName
Today `DynamicIndexName` generates the names based on UTC. This doesn't work for environments where the indices rollover is based on a local/different timezone.

The timezone can be configured:
 * globally with the `watcher.dynamic_indices.time_zone` setting
 * collectively to all `search` input, `search` transform and `index` action with `watcher.input.search.dynamic_indices.time_zone`, `watcher.transform.search.dynamic_indices.time_zone` and `watcher.actions.index.dynamic_indices.time_zone` respectively
 * locally on the watch as part of the `search` input, `search` transform and/or `index` action definition.

This commit revealed a set of bugs in the `search` input, `search` transform and/or `index` action when it comes to xcontent serialization. In short, when the user didn't define a timeout, a default timeout was set on them, which meant their serialized xcontent did not match the original one (from which they're deserialized). This bug also meant that the global default client timeouts (defined in the `ClientProxy` never took effect.

  This issue revealed the bugs above as the `WatchTests` were enhanced to execute more settings permutations

Closes elastic/elasticsearch#632

Original commit: elastic/x-pack-elasticsearch@35a2191828
2015-06-29 15:36:34 +03:00
Martijn van Groningen 0a07d6dee5 index templates: Change the TemplateUtils to be a TemplateRegistry that is responsible for maintaining the Watcher index templates.
The TemplateRegistry adds templates based on if these index templates exist in the cluster state. Components that rely on index templates register their template config with the TemplateRegistry. The TemplateRegistry adds these templates in the background when a cluster state update occurs and add component index settings to the index template. Also when component index settings change, the index template will be updated by the TemplateRegistry.

If a registered index template gets deleted, it will be added back by the TemplateRegistry in background if in a cluster state the index template is missing.

Original commit: elastic/x-pack-elasticsearch@97f4f42160
2015-06-29 12:30:39 +02:00
Martijn van Groningen 521b6e8cf3 lifecycle: Only fork a thread if we start and stop from cluster state update if the watcher state is expected
Also improved some log statements.

Original commit: elastic/x-pack-elasticsearch@7c72550c63
2015-06-26 18:43:17 +02:00
uboness fcad80b973 fixed typo in NOTICE.txt
Original commit: elastic/x-pack-elasticsearch@90bded37ea
2015-06-26 17:02:15 +03:00
uboness a459c753ad Added NOTICE.txt
- added both the `NOTICE.txt` and `LICENSE.txt` to the distribution

Original commit: elastic/x-pack-elasticsearch@5acfd50874
2015-06-26 16:49:28 +03:00
Chris Cowan c43433d580 Merge pull request elastic/elasticsearch#443 from simianhacker/feature/issues
Issues Feature

Original commit: elastic/x-pack-elasticsearch@cefd91100d
2015-06-25 11:15:19 -07:00
Chris Cowan 6c3052d1ab Merge pull request elastic/elasticsearch#437 from panda01/master
Chart and Cluster Status Directives

Original commit: elastic/x-pack-elasticsearch@cd3559db33
2015-06-25 11:14:39 -07:00
Chris Cowan e67359ca09 Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into feature/issues
Original commit: elastic/x-pack-elasticsearch@907dc62b0c
2015-06-25 10:15:25 -07:00
uboness 266dfbb3c5 Added version 1.0.0 to WatcherVersion
Original commit: elastic/x-pack-elasticsearch@f7a0996ddf
2015-06-25 16:54:20 +02:00
uboness 39f9f53a0a Renamed the status field in the stored watch
was renamed to `_status` so it'll distinct from the other "formal" fields of the watch and also be aligned with the `_status` field that is returned by the Get API.

Also updated the installation docs

Original commit: elastic/x-pack-elasticsearch@1081b75d13
2015-06-25 15:39:19 +02:00
Martijn van Groningen 9cb7232075 test: Use utc time to create index name in test, since that is what internally is used too.
Original commit: elastic/x-pack-elasticsearch@48f300f657
2015-06-25 00:36:47 +02:00
Martijn van Groningen 193d8092db Added timeout option to the `search` transform, `search` input and `index` action.
Added default timeout setting:
* `watcher.action.index.default_timeout` sets the timeout for `index` action, if no timeout is defined in the `index` action itself.
* `watcher.input.search.default_timeout` sets the timeout for `search` input, if no timeout is defined in the `search` input itself.
* `watcher.transform.search.default_timeout`  sets the timeout for `search` transform, if no timeout is defined in the `search` transform itself.

Added general Watcher wide default timeout settings to the operations exposed in the client proxy:
* `watcher.internal.ops.search.default_timeout` for search related operations.
* `watcher.internal.ops.index.default_timeout` for index operations.
* `watcher.internal.ops.bulk.default_timeout` for bulk operations.

Original commit: elastic/x-pack-elasticsearch@5a3ef35a9d
2015-06-25 00:10:24 +02:00
Martijn van Groningen 591ea500f2 test: Fetch the status from the get response itself instead of the watch source
Original commit: elastic/x-pack-elasticsearch@ab0f4b8fe9
2015-06-24 22:29:17 +02:00
Martijn van Groningen ba17333523 get watch api: Return the watch status separate from the watch source.
The status isn't maintained by the user but rather by Watcher itself. The idea here is that the get watch api should return the watch as was provided to Watcher via the put watch api. The status will be reported under the top level `_status` field.

Original commit: elastic/x-pack-elasticsearch@54e2452493
2015-06-24 21:31:52 +02:00
Martijn van Groningen 67fdad6357 If starting watcher fails, watcher should set itself back to the stopped state.
At the moment if the starting fails watcher will hang in the `starting` phase. This is bad because any subsequent start will be ignored, because the the watcher state isn't `stopped`.

Original commit: elastic/x-pack-elasticsearch@5cbc1d2a13
2015-06-24 21:06:57 +02:00
jaymode 8258cd9f18 add versions 1.2.2 and 1.3.0
Original commit: elastic/x-pack-elasticsearch@b449e20b66
2015-06-24 13:28:26 -04:00
jaymode a7be4867c1 Test: fix exception text assert due to change in es core
Original commit: elastic/x-pack-elasticsearch@c9e711f8c9
2015-06-24 11:45:02 -04:00
uboness b8e80773d9 Fixed the stats API
- now reflects the right stats around the execution threadpool

Original commit: elastic/x-pack-elasticsearch@ecf557c6be
2015-06-24 15:53:06 +02:00
Martijn van Groningen be33ee6323 fixed compile error due to a recent upstream change in core
Original commit: elastic/x-pack-elasticsearch@f09b84c928
2015-06-24 15:11:49 +02:00
Martijn van Groningen d1bc1e1f68 fixed compile error
Original commit: elastic/x-pack-elasticsearch@9675f254c3
2015-06-24 14:04:22 +02:00
uboness bbabf8ba85 fixed build failure
failed due changes in core master

Original commit: elastic/x-pack-elasticsearch@43f6badffe
2015-06-24 12:20:56 +02:00
Martijn van Groningen 26a72e4d21 lifecycle: upon node shutdown make clear it is a manual stop, so that potential cluster states that come in after the LifyCycle#beforeStop can't start watcher.
Original commit: elastic/x-pack-elasticsearch@e2522a21fc
2015-06-24 06:56:01 +02:00
Khalah Jones-Golden b6531876fb [Merge] Merged with latest master
Original commit: elastic/x-pack-elasticsearch@b622a9e74b
2015-06-23 18:02:42 -04:00
Khalah Jones Golden cf6f4422e1 Merge pull request elastic/elasticsearch#438 from simianhacker/master
Refactor Plugin Layout and Settings

Original commit: elastic/x-pack-elasticsearch@c5d8fa0219
2015-06-23 16:51:27 -04:00
Chris Cowan 03380b74e0 Refactor plugin layout; add settings; start issues work
Original commit: elastic/x-pack-elasticsearch@dae4d50d49
2015-06-23 13:45:52 -07:00
uboness c4dbb8d794 [cleanup] index names parser
Was bound in guice without a reason.

Original commit: elastic/x-pack-elasticsearch@75a9b66946
2015-06-23 17:58:45 +02:00
Martijn van Groningen d46dad18d0 Added logging in case state is unexpected when starting or stopping.
Also increased test logging in BootStrapTests.

Original commit: elastic/x-pack-elasticsearch@6b8141dbc0
2015-06-23 16:15:50 +02:00
uboness 71aa3a8059 Added Dynamic Index Names Support
The search input/transform rely on users configuring the search requests. Sometimes (often), these search requests are executed on time-based indices. The problem the

Until now, there's no way to define dynamic index names that are bound to time, which forces the request to search all the indices (for example, the Marvel watches se

This commit adds dynamic index name resolution. It works in the following way:

- and index name can be a simple string (indicating the static/absolute index name you're searching, incl. wildcards)
- an index name can also be a template. The template is enclosed within `<` and `>` (these are officially illegal characters for index names, so these are safe to use)
- the template can have both static parts to it and place holder parts. The place holders are enclosed within `{` and `}`. The place holder holds `date math` expression
 * `"<.marvel-{now}>"` will resolve to `".marvel-2022.03.03"` (the default date format is `YYYY.MM.dd`)
 * `"<.marvel-{now/M}>"` will resolve to `".marvel-2022.03.01"`
 * `"<.marvel-{now{YYYY.MM}}>"` will resolve to `".marvel-2022.03"` (this one has a custom date format - `YYYY.MM`)
 * `"<.marvel-{now/M-1M{YYYY.MM}}>"` will resolve to `".marvel-2022.02"`

The following is an example of a search input that searches marvel indices for the last 3 days (relies on the default Marvel indices format - `.marvel-YYYY.MM.dd`):

```
{
    ...
    "input" : {
            "search" : {
                    "request" : {
                            "indices" : [
                                    "<.marvel-{now/d-2d}>",
                                    "<.marvel-{now/d-1d}>",
                                    "<.marvel-{now/d}>"
                            ],
                            ...
                    }
            }
    }
    ...
}
```

- `index` action was also updated to work with a dynamic index name (e.g. it's possible to index into daily indices by setting the index name to `<idx-{now}>`)

Original commit: elastic/x-pack-elasticsearch@9c15a96029
2015-06-23 15:54:45 +02:00
jaymode d65bfd1721 use doc_values for most fields in audit indices
This changes the mappings for the audit indices to use doc_values for all fields
other than the request_body, which will have a lot of variance. Additionally, the
request_body field is no longer indexed.

Closes elastic/elasticsearch#918

Original commit: elastic/x-pack-elasticsearch@4917529ffa
2015-06-23 09:40:27 -04:00
Martijn van Groningen d2d1c44d07 test: increased test logging
Original commit: elastic/x-pack-elasticsearch@455892c628
2015-06-23 15:31:06 +02:00