uboness
1c4c25fbf6
Initial cleanup of shield integration in watcher and marvel
...
- Removed Marvel/WatcherUserHolder in favour of the new `InternalMarvelUser`/`InternalWatcherUser`
Original commit: elastic/x-pack-elasticsearch@8181630144
2015-12-07 14:08:43 +01:00
jaymode
68e3c0a08e
test: disable marvel for watcher with groovy tests
...
This commit disables marvel when running the watcher with groovy tests. Marvel creates
indices and expect the cluster to be green, which won't happen with the marvel indices
existing and expecting a replica.
See elastic/elasticsearch#1087
Original commit: elastic/x-pack-elasticsearch@8d163a53b7
2015-12-07 06:39:33 -05:00
Timothy Sullivan
ea4bae5149
Merge branch 'master-reorganize' of /Users/tsullivan/code/marvel
...
Original commit: elastic/x-pack-elasticsearch@4218807caf
2015-12-06 01:16:31 -07:00
Timothy Sullivan
d3fb668346
move public code to kibana/marvel
...
Original commit: elastic/x-pack-elasticsearch@13d409da5d
2015-12-06 00:51:20 -07:00
Robert Muir
f3fd72c9d0
Use Date instead of System in groovy script... its absurd to expect scripts can use System
...
Original commit: elastic/x-pack-elasticsearch@9b32e621c7
2015-12-05 22:13:50 -05:00
Tim Sullivan
d022e8d276
Merge pull request elastic/elasticsearch#672 from tsullivan/initial-server-tests
...
Initial server tests
Original commit: elastic/x-pack-elasticsearch@30f3a762f7
2015-12-04 16:50:53 -07:00
Ryan Ernst
ad36c3f0dd
Merge pull request elastic/elasticsearch#1086 from rjernst/jigsaw
...
Build: Changes to tests for modules in elasticsearch
Original commit: elastic/x-pack-elasticsearch@95e0c53939
2015-12-04 11:53:05 -08:00
Ryan Ernst
3e9d29d9b9
Update plugins smoke test to use correct plugin count for xpack
...
Original commit: elastic/x-pack-elasticsearch@40f464acbd
2015-12-04 11:52:31 -08:00
Ryan Ernst
2521e567f1
Merge branch 'master' into jigsaw
...
Original commit: elastic/x-pack-elasticsearch@c7534cfcf0
2015-12-04 11:39:33 -08:00
jaymode
8e5b5688f5
test: change watcher rest tests to wait for yellow
...
Since we combined all of the plugins marvel will also be enabled and will cause
the cluster to never get to a green state since we only have a single node.
Original commit: elastic/x-pack-elasticsearch@60fbfa97f1
2015-12-04 14:18:07 -05:00
Ryan Ernst
c8de04ae14
make smoke test plugins (and ssl) work again
...
Original commit: elastic/x-pack-elasticsearch@3d2413823e
2015-12-03 23:38:48 -08:00
Robert Muir
3ec04ba40f
fix tests
...
Original commit: elastic/x-pack-elasticsearch@54d56efdbd
2015-12-04 02:12:22 -05:00
Ryan Ernst
b56aa9064d
remove adding groovy as an explicit module in watcher qa test
...
Original commit: elastic/x-pack-elasticsearch@2e7e3cfd94
2015-12-03 23:09:31 -08:00
Robert Muir
b63bb69cff
Merge branch 'master' into jigsaw
...
Original commit: elastic/x-pack-elasticsearch@6fb2ef0249
2015-12-04 01:48:18 -05:00
Ryan Ernst
afb8b2a890
changes for ES modularization
...
Original commit: elastic/x-pack-elasticsearch@1e130f1693
2015-12-03 15:17:02 -08:00
jaymode
a039acf578
more fixes for the combined plugin
...
* move static initialization hack for UnboundID Debug to XPackPlugin
* cleanup bundlePlugin calls in build file
* properly disable watcher and marvel for shield core tests
Original commit: elastic/x-pack-elasticsearch@2b89cf2225
2015-12-03 14:56:12 -05:00
jaymode
aca0c96d6a
remove leftover use of onIndexService and disable license check
...
Original commit: elastic/x-pack-elasticsearch@1cdf5c9f95
2015-12-03 11:16:41 -05:00
jaymode
9b2dd0c11d
fixes after rebase
...
Original commit: elastic/x-pack-elasticsearch@6896b88829
2015-12-03 16:24:40 +01:00
jaymode
628febf3f7
fix integration tests after reorganization
...
This commit fixes the integration tests and qa test after the reorganization to be
packaged as a single plugin.
Original commit: elastic/x-pack-elasticsearch@d6f488627f
2015-12-03 16:24:40 +01:00
jaymode
e1c1552eb2
fix tests so gradle test passes
...
Original commit: elastic/x-pack-elasticsearch@30683bd771
2015-12-03 16:24:40 +01:00
uboness
13a8c98cb2
[WIP] unified x-pack repo restructuring
...
- added the license-plugin dir as a src dir
- Made XPackPlugin customizable for tests. Now tests that need to plug in different behaviours (e.g. a custom license plugin) can do that by simply resetting the relevant delegee plugins (i.e. shield, marvel, license, watcher) in the ctor of a new XPackPlugin.
Original commit: elastic/x-pack-elasticsearch@ab83104955
2015-12-03 16:24:40 +01:00
Ryan Ernst
7ef87632ab
Moved shield, watcher, marvel and license plugin into common x-pack
...
project, and combined their gradle builds. Everything builds, but many
many tests fail.
Original commit: elastic/x-pack-elasticsearch@d18d4614aa
2015-12-03 16:24:40 +01:00
jaymode
e5b0e7f5cb
reorganize directory layout
...
See elastic/elasticsearch#1022
Original commit: elastic/x-pack-elasticsearch@3ee8761312
2015-12-03 16:22:37 +01:00
Adrien Grand
8645bd4ecd
Merge pull request elastic/elasticsearch#1041 from jpountz/fix/remove_onIndexService
...
Stop using onIndexService.
Original commit: elastic/x-pack-elasticsearch@d048f0ee78
2015-12-03 09:45:33 +01:00
Timothy Sullivan
3982c12964
add the first server-side unit test
...
Original commit: elastic/x-pack-elasticsearch@d6680ecb57
2015-12-02 15:34:59 -07:00
Ryan Ernst
83c2f1b3c4
Build: Disable licenses checks for all xplugins
...
Original commit: elastic/x-pack-elasticsearch@f6a29344e9
2015-12-02 11:05:16 -08:00
Jason Tedor
b0b60f785e
Merge pull request elastic/elasticsearch#1075 from jasontedor/ban-type-unsafe-empty-collections-fields
...
Remove and forbid use of the type-unsafe empty Collections fields
Original commit: elastic/x-pack-elasticsearch@9e2a482f38
2015-12-02 11:00:24 -05:00
Jason Tedor
8ea7a62b86
Remove and forbid use of the type-unsafe empty Collections fields
...
This commit removes and now forbids all uses of the type-unsafe empty
Collections fields Collections#EMPTY_LIST, Collections#EMPTY_MAP, and
Collections#EMPTY_SET. The type-safe methods Collections#emptyList,
Collections#emptyMap, and Collections#emptySet should be used instead.
Relates elastic/elasticsearchelastic/elasticsearch#15187
Original commit: elastic/x-pack-elasticsearch@99f6fdd3a6
2015-12-02 10:44:23 -05:00
Adrien Grand
b43f81a15c
Use IndexModule.getSettings() to get the settings.
...
Original commit: elastic/x-pack-elasticsearch@770f859b6c
2015-12-02 14:57:52 +01:00
Adrien Grand
afb5cc0d08
Stop using onIndexService.
...
Now that mappers are registered at the index level, Shield is the last user
of Plugin.onIndexService. Yet this can be implemented on the IndexModule by
registering a listener on index creation.
Once this change is merged, we can remove Plugin.onIndexService entirely.
Original commit: elastic/x-pack-elasticsearch@fba6809949
2015-12-02 14:50:29 +01:00
Robert Muir
828097b281
fix watcher to compile with full jdk for now
...
Original commit: elastic/x-pack-elasticsearch@09897a26eb
2015-12-01 14:12:07 -05:00
Tanguy Leroux
445e81bb70
Marvel: Mute MultiNodesStatsTests
...
Original commit: elastic/x-pack-elasticsearch@f0adbf3e20
2015-12-01 16:03:42 +01:00
Court Ewing
62eb776868
Merge pull request elastic/elasticsearch#1056 from epixa/fieldstats
...
Add field_stats to kibana user role in shield
Original commit: elastic/x-pack-elasticsearch@db07763022
2015-11-30 12:33:29 -05:00
Court Ewing
acff7a8f4c
Add field_stats to kibana user role in shield
...
Kibana 4.3 now uses the field_stats api to pre-flight all search
requests to any configured index patterns, so shield needs to allow it.
Original commit: elastic/x-pack-elasticsearch@793ad01424
2015-11-30 10:32:09 -05:00
Robert Muir
8043eb2750
Merge pull request elastic/elasticsearch#1054 from rmuir/simplify_ssl_test
...
Simplify SSL test to not use openssl.
Original commit: elastic/x-pack-elasticsearch@c07ecbfdc4
2015-11-30 10:30:42 -05:00
Robert Muir
9df905ff19
Simplify SSL test to not use openssl.
...
I think the intent here is to just test that our SSL layers work,
not invoke a long chain of keytool + openssl commands.
This simplifies the build and will work on windows.
Original commit: elastic/x-pack-elasticsearch@af07d0d4f7
2015-11-30 09:28:16 -05:00
Robert Muir
d8e4c06522
Merge pull request elastic/elasticsearch#1053 from rmuir/openssl_windows
...
smoke-test-plugins-ssl shoudl check if openssl is available
Original commit: elastic/x-pack-elasticsearch@7eb76fdf3a
2015-11-30 08:58:09 -05:00
Robert Muir
8a22ba0a08
smoke-test-plugins-ssl shoudl check if openssl is available
...
Today some jenkins servers dont have it (e.g. windows), and it constantly fails...
Original commit: elastic/x-pack-elasticsearch@6b561c73e0
2015-11-30 08:42:25 -05:00
javanna
171179d91f
[TEST] non stored fields are not returned anymore via fields
...
Relates to https://github.com/elastic/elasticsearch/issues/14489
Original commit: elastic/x-pack-elasticsearch@2897dc5df7
2015-11-30 12:12:31 +01:00
Ryan Ernst
7277d280ca
Merge pull request elastic/elasticsearch#1050 from rjernst/extra_config_file_delay
...
Build: Remove hack to touch keystore before it is created
Original commit: elastic/x-pack-elasticsearch@aa2a950129
2015-11-29 10:19:42 -08:00
Ryan Ernst
a67aebc9fc
Build: Remove hack to touch keystore before it is created
...
This will be fixed in ES with elastic/elasticsearchelastic/elasticsearch#15089
Original commit: elastic/x-pack-elasticsearch@55b42a7ad4
2015-11-28 18:07:37 -08:00
Daniel Mitterdorfer
ad697c077e
Reenable SSL smoke tests
...
Original commit: elastic/x-pack-elasticsearch@1969c6d020
2015-11-27 17:25:51 +01:00
Daniel Mitterdorfer
f1b32117ac
Add dependency on NetworkModule in AuditTrailModuleTests
...
Original commit: elastic/x-pack-elasticsearch@d5c0429d33
2015-11-27 15:52:51 +01:00
Daniel Mitterdorfer
75d66dfa95
Add SettingsFilter to SettingsModule in tests (change in core)
...
Original commit: elastic/x-pack-elasticsearch@004edbcf76
2015-11-27 14:40:29 +01:00
Daniel Mitterdorfer
b9b39efac8
Disable SSL integration tests temporarily
...
We disable SSL integration tests as a workaround for
https://github.com/elastic/infra/issues/628 to ensure
other problems can still be caught.
Original commit: elastic/x-pack-elasticsearch@47bf56faec
2015-11-27 10:23:03 +01:00
Ryan Ernst
660ac633a6
Merge pull request elastic/elasticsearch#1043 from rjernst/remove_ant_contrib
...
Build: Simplify ssl test to not use ant
Original commit: elastic/x-pack-elasticsearch@14d41f6fc1
2015-11-25 11:28:46 -08:00
Robert Muir
b529e4da6f
Merge pull request elastic/elasticsearch#1023 from rmuir/bad_apples
...
Mark sleeping tests from elastic/elasticsearch#1007 @BadApple
Original commit: elastic/x-pack-elasticsearch@e16c54b050
2015-11-25 14:25:52 -05:00
Ryan Ernst
59a10e6309
Build: Simplify ssl test to not use ant
...
This change ports the tasks from the ssl ant build file into gradle tasks.
Original commit: elastic/x-pack-elasticsearch@af88196050
2015-11-25 11:23:26 -08:00
Robert Muir
9f7d172478
Merge pull request elastic/elasticsearch#1040 from rmuir/messy-groovy-tests
...
Move disabled watcher+groovy "unit" tests to qa/messy-test-watcher-with-groovy
Original commit: elastic/x-pack-elasticsearch@24ee8de740
2015-11-25 14:16:36 -05:00
Robert Muir
ae24881484
Move disabled watcher+groovy "unit" tests to qa/messy-test-watcher-with-groovy
...
This is all the tests disabled from https://github.com/elastic/x-plugins/issues/724
At least, they will be running in the build in some way. If we can fix gradle to
add plugin metadata from lang-groovy to the test classpath, security manager
can be re-enabled for these as well.
But its also only 8 tests, maybe its easier to fix them?
Original commit: elastic/x-pack-elasticsearch@a5c407b80f
2015-11-25 13:29:00 -05:00