Commit Graph

1647 Commits

Author SHA1 Message Date
Martijn van Groningen ca8a7bb262 added watcher+shield qa rest tests
only run watcher rest tests during verify phase
never run the rest tests with shield enabled, because that is now tested in the new qa module
removed the disabled license watcher rest tests, because the disabled license use case is already tested by the LicenseIntegrationTests
enabled the getting started rest test

Closes elastic/elasticsearch#403

Original commit: elastic/x-pack-elasticsearch@67f0f7f596
2015-08-12 14:11:45 +02:00
Adrien Grand 9479569b02 Merge pull request elastic/elasticsearch#429 from jpountz/enhancement/qa_shield_ssl
Tests: Smoke tests with SSL enabled.

Original commit: elastic/x-pack-elasticsearch@39361caa4b
2015-08-12 14:10:06 +02:00
Adrien Grand cd5169745d Tests: Smoke tests with SSL enabled.
We should smoke test our plugins with ssl enabled to make sure that plugins
still work together and eg. Marvel still manages to export stats.

Close elastic/elasticsearch#402

Original commit: elastic/x-pack-elasticsearch@3bb7c2b96c
2015-08-12 14:04:49 +02:00
Adrien Grand 2842898c1c Build: cut over to the new startup-elasticsearch syntax.
Original commit: elastic/x-pack-elasticsearch@29582a18b9
2015-08-11 18:54:08 +02:00
jaymode 0b4512582f fix integration test runs due to changes in core around argument definition
Original commit: elastic/x-pack-elasticsearch@af2a85cf91
2015-08-11 09:01:14 -04:00
Martijn van Groningen 8a4260db46 test: disable getting started rest test until it gets fixed
Original commit: elastic/x-pack-elasticsearch@40ba3d6ba9
2015-08-11 14:27:11 +02:00
Martijn van Groningen 892c4f8194 Merge pull request elastic/elasticsearch#406 from martijnvg/test/monitor_cluster_health
Moved smoke test script to yaml rest test.

Original commit: elastic/x-pack-elasticsearch@5427f7c698
2015-08-11 13:10:28 +02:00
Martijn van Groningen 1372bdef22 test: moved smoke test to yaml rest test.
Original commit: elastic/x-pack-elasticsearch@5a8bfeee2e
2015-08-11 13:03:42 +02:00
Adrien Grand 2322e42a70 Merge pull request elastic/elasticsearch#424 from jpountz/enhancement/qa_shield
Add Shield testing to qa/smoke-test-plugins.

Original commit: elastic/x-pack-elasticsearch@e5916e4522
2015-08-11 10:55:54 +02:00
Adrien Grand 12e9dcc684 Add Shield testing to qa/smoke-test-plugins.
Original commit: elastic/x-pack-elasticsearch@fbbc6cefda
2015-08-11 10:54:50 +02:00
Martijn van Groningen 682fdc3024 test: removed es core rest spec copies and fetch them during the build process instead.
Original commit: elastic/x-pack-elasticsearch@e92e3e3778
2015-08-11 10:53:48 +02:00
Adrien Grand d3789db974 Build: Remove definition of `convert-plugin-name`.
Follow-up of elastic/elasticsearchelastic/elasticsearch#12765.

Original commit: elastic/x-pack-elasticsearch@f75538e87b
2015-08-11 10:38:29 +02:00
Ryan Ernst ceb932a276 Fix transport test to use plugin to hookup mock
Original commit: elastic/x-pack-elasticsearch@397c6bc2dc
2015-08-10 17:53:37 -07:00
jaymode 85eeeab88a add release notes for Shield 1.3.2
Original commit: elastic/x-pack-elasticsearch@f4f3101aa2
2015-08-10 13:10:28 -04:00
Martijn van Groningen 3876bde0c2 Don't use Settings#getClassLoader() because it doesn't return the classloader the plugin was being loaded with.
Closes elastic/elasticsearch#419

Original commit: elastic/x-pack-elasticsearch@1c4b4b8760
2015-08-10 16:13:15 +02:00
Adrien Grand 214dc6e5be Build: Fix artifactId of qa/smoke-test-plugins.
Original commit: elastic/x-pack-elasticsearch@c84753e933
2015-08-10 14:01:26 +02:00
Adrien Grand f7cee828e3 Build: Make the qa module extend the x-plugins artifact.
This way it will inherit the repositories definitions.

Original commit: elastic/x-pack-elasticsearch@5d6ee26596
2015-08-10 11:56:46 +02:00
Adrien Grand f38b92b917 Merge pull request elastic/elasticsearch#405 from jpountz/enhancement/qa_tests
Add a skeleton for QA tests.

Original commit: elastic/x-pack-elasticsearch@97df15390c
2015-08-10 11:00:53 +02:00
Adrien Grand 2cd124d263 Add a skeleton for QA tests.
For now this just tries to install license, marvel and watcher, and then checks
that these plugins are listed in the node infos. I can do shield once I figure
out how to set it up for REST tests.

Original commit: elastic/x-pack-elasticsearch@8549f4bc5a
2015-08-10 10:55:58 +02:00
Martijn van Groningen cf1409ed02 fix watcher runner
Original commit: elastic/x-pack-elasticsearch@243fa1b153
2015-08-10 10:48:21 +02:00
Tanguy Leroux 20a65dd6ca Watcher: Fix compilation issue in WatcherF class
Related to elastic/elasticsearch@368c41666c

Original commit: elastic/x-pack-elasticsearch@ae6de46457
2015-08-10 09:55:28 +02:00
Clinton Gormley c098848765 Moved the license checker override into the right phase in pom.xml
Original commit: elastic/x-pack-elasticsearch@4b0060c575
2015-08-09 21:40:37 +02:00
Clinton Gormley 24da78a913 Disable the license checker for x-plugins
Original commit: elastic/x-pack-elasticsearch@36b3b30217
2015-08-09 20:49:00 +02:00
Martijn van Groningen f726a8a017 Fixed rest runners that check watcher+shield and an expired license.
* The watcher+shield test failed, but the error was ignored due to a buggy if statement that existed for the hijack rest test.
* Blacklisted the hijack test.
* Also ade sure that we run the watcher+rest test with an user that doesn't have credentials.

Original commit: elastic/x-pack-elasticsearch@61b1bf0142
2015-08-07 14:26:22 +02:00
jaymode 1b72f13458 fix the rest response for the clear cache action and add tests
Today the XContent building of the response for the ClearRealmsCacheResponse is broken and causes
an exception to be thrown. This fixes the building of the response and adds tests that call the HTTP
endpoint and do a basic check on the response.

Closes elastic/elasticsearch#390

Original commit: elastic/x-pack-elasticsearch@8ad9dae4ea
2015-08-06 12:48:44 -04:00
Alexander Reelsen b433ee390c Packaging: Changing groupId to org.elasticsearch.plugin
This commit changes the groupId to the above mentioned one
so that S3 uploads will end up in the right bucket. This will
allow the Elasticsearch plugin manager to install the commercial
plugins like

```
bin/plugin install {watcher,shield,license,marvel}
```

like the official ones.

Original commit: elastic/x-pack-elasticsearch@642f1f006a
2015-08-06 15:46:48 +02:00
Robert Muir ef01b29158 fix shield integ startup to be cleaner
Original commit: elastic/x-pack-elasticsearch@65bbc5b64a
2015-08-06 08:32:49 -04:00
jaymode fc7d0c017a fix Shield compilation error due to changes in core
Original commit: elastic/x-pack-elasticsearch@1e2a77595b
2015-08-06 07:11:30 -04:00
Robert Muir 9133f766d3 fix skip.integ.tests to work everywhere again
Original commit: elastic/x-pack-elasticsearch@9cd5ca6db8
2015-08-06 07:07:23 -04:00
Robert Muir faec3cffa9 Merge branch 'master' of github.com:elastic/x-plugins
Original commit: elastic/x-pack-elasticsearch@43a0149126
2015-08-06 06:13:32 -04:00
Robert Muir 0ba276d44f FUCK YOU GIT
Squashed commit of the following:

commit 9e1eee30eca33e96fc0010300331207ae609a825
Author: Robert Muir <rmuir@apache.org>
Date:   Thu Aug 6 06:11:15 2015 -0400

    fix shield integration tests with master changes

    TODO: this all needs cleanup

commit elastic/x-pack@098f8994a6
Author: debadair <deb.adair@elasticsearch.com>
Date:   Wed Aug 5 13:09:17 2015 -0700

    Added missing description and edited the table.

commit elastic/x-pack@f1782adb40
Author: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date:   Wed Jul 15 14:08:27 2015 +0200

    There is no need to check if the primary shards of the history indices are started, since we don't load watch records any more during the Watcher startup process.

commit elastic/x-pack@689fdcd00b
Author: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date:   Fri Jul 17 22:44:52 2015 +0200

    Use custom metadata to remember that Watcher stopped via an explicit stop api call.

    Also expose WatcherMetaData in stats api

commit elastic/x-pack@abaa42d608
Author: Tanguy Leroux <tlrx.dev@gmail.com>
Date:   Wed Aug 5 11:31:42 2015 +0200

    Marvel: Add Cluster Stats timeout

commit elastic/x-pack@1be4701a4b
Author: uboness <uboness@gmail.com>
Date:   Wed Aug 5 00:20:05 2015 +0200

    [watcher] Remove default timezone usage

    Closes elastic/elasticsearch#387

commit elastic/x-pack@88f588d97b
Merge: elastic/x-pack@c49a303 elastic/x-pack@bb12e9a
Author: Robert Muir <rcmuir@gmail.com>
Date:   Tue Aug 4 17:11:52 2015 -0400

    Merge pull request elastic/elasticsearch#386 from rmuir/shield_integ_update

    adapt shield to integration tests changes

commit elastic/x-pack@bb12e9aa8d
Author: Robert Muir <rmuir@apache.org>
Date:   Tue Aug 4 16:17:23 2015 -0400

    adapt shield to integration tests changes

    we don't use ports 9200/9300 by default for integration tests anymore.
    they easily conflict with the user running/debugging es on their machine.

Original commit: elastic/x-pack-elasticsearch@17a474df2c
2015-08-06 06:13:16 -04:00
debadair 56c3f41a6e Added missing description and edited the table.
Original commit: elastic/x-pack-elasticsearch@69f07459af
2015-08-05 13:09:17 -07:00
Martijn van Groningen 64ee394460 There is no need to check if the primary shards of the history indices are started, since we don't load watch records any more during the Watcher startup process.
Original commit: elastic/x-pack-elasticsearch@e6bfb37477
2015-08-05 18:58:11 +02:00
Martijn van Groningen 3f0509923a Use custom metadata to remember that Watcher stopped via an explicit stop api call.
Also expose WatcherMetaData in stats api

Original commit: elastic/x-pack-elasticsearch@5581615f9c
2015-08-05 18:55:52 +02:00
Tanguy Leroux e87b3d0681 Marvel: Add Cluster Stats timeout
Original commit: elastic/x-pack-elasticsearch@6a5631d124
2015-08-05 11:31:42 +02:00
uboness 5f932952f2 [watcher] Remove default timezone usage
Closes elastic/elasticsearch#387

Original commit: elastic/x-pack-elasticsearch@5382fecf10
2015-08-05 00:20:14 +02:00
Robert Muir 87f8f6a0a6 Merge pull request elastic/elasticsearch#386 from rmuir/shield_integ_update
adapt shield to integration tests changes

Original commit: elastic/x-pack-elasticsearch@f76cff75ea
2015-08-04 17:11:52 -04:00
Robert Muir 46685fd5ee adapt shield to integration tests changes
we don't use ports 9200/9300 by default for integration tests anymore.
they easily conflict with the user running/debugging es on their machine.

Original commit: elastic/x-pack-elasticsearch@3ff7491459
2015-08-04 16:17:23 -04:00
jaymode e8364d6b50 add a property for attaching assemblies and disable it for public deployment
Currently, we attach the zip assembly for all plugins but Shield when deploying. This is problematic because
we want to track the downloads of the zips through our downloads service. This commit changes the
behavior to not attach the zip assembly when deploying publicly.

The source files were also being attached even for public deployments and this commit adds a property to
stop that for public deployments and a check to ensure that no sources or zip file is attached when deploying
publicly.

Additionally, the default profile overrides the distribution management of the parent pom(s) so that a deploy
without a profile specified will not work. Without this change issuing a deploy command on a machine that
has credentials for sonatype's repositories could have deployed the artifacts to the sonatype OSS repository.

Closes elastic/elasticsearch#321

Original commit: elastic/x-pack-elasticsearch@37a0a6c312
2015-08-04 12:46:04 -04:00
Tanguy Leroux 14b30fd80c Marvel: Fix IndexRecoveryCollectorTests
This commit fixes and simplifies the IndexRecoveryCollectorTests.

closes elastic/elasticsearch#366

Original commit: elastic/x-pack-elasticsearch@9112a45e01
2015-08-04 13:42:40 +02:00
jaymode 571c04dd79 add realm name to connection pool log message
See elastic/elasticsearch#325

Original commit: elastic/x-pack-elasticsearch@c25019cbb9
2015-08-04 07:36:27 -04:00
Tanguy Leroux a7645ed4f0 Fix compilation issue following removal of Streams.copyToStringFromClasspath() from core
Original commit: elastic/x-pack-elasticsearch@d7d0dfd640
2015-08-04 11:42:17 +02:00
Robert Muir d3c0468a6c Merge pull request elastic/elasticsearch#381 from rmuir/redundant_tests
Don't redundantly run shield rest tests in both unit and integ tests.

Original commit: elastic/x-pack-elasticsearch@e5a30c4fdc
2015-08-03 22:48:47 -04:00
Robert Muir 40083d9152 Don't redundantly run rest tests in both unit and integ tests.
We can just run these during the integration test phase: there is
no benefit in running them during `mvn test` too.

Original commit: elastic/x-pack-elasticsearch@4b275920e2
2015-08-03 22:04:33 -04:00
Ryan Ernst 402c55c739 Merge pull request elastic/elasticsearch#380 from rjernst/fix/test-renames
Rename test cases to use new test name patterns

Original commit: elastic/x-pack-elasticsearch@e07ce966f4
2015-08-03 18:50:48 -07:00
Ryan Ernst cfc4c6eca2 Rename integ tests back from IT extension
Original commit: elastic/x-pack-elasticsearch@e4ffa393ba
2015-08-03 18:47:33 -07:00
Ryan Ernst ae02762b95 Rename test cases to use new test name patterns
With elastic/elasticsearchelastic/elasticsearch#12623 base test classes were renamed
to use "TestCase" suffix. This updates x-plugins to reflect those
name changes. It also renames some tests that were marked
with @Slow (which was forbidden with elastic/elasticsearchelastic/elasticsearch#12617 and
elastic/elasticsearch elastic/elasticsearch#12618) to use the IT suffix to run
under `mvn verify`.

Original commit: elastic/x-pack-elasticsearch@05ffe2f202
2015-08-03 18:18:18 -07:00
Robert Muir 06862df7dd Merge pull request elastic/elasticsearch#378 from rmuir/home_file_cleanup
switch over uses of homeFile() to binFile().getParent().

Original commit: elastic/x-pack-elasticsearch@83f229934a
2015-08-03 13:55:07 -04:00
Robert Muir aca4133fbd Fix mocking here
Original commit: elastic/x-pack-elasticsearch@39903ee7b5
2015-08-03 13:46:28 -04:00
Robert Muir 875e2e67c5 switch over uses of homeFile() to binFile().getParent().
homeFile() is removed and should not be used, we need to cleanup,
but this is just a rote change to get builds green.

Original commit: elastic/x-pack-elasticsearch@05d0fb4a7c
2015-08-03 13:36:22 -04:00