Commit Graph

279 Commits

Author SHA1 Message Date
David Pilato 5899dc5f46 [maven] fix build issues with artifactId renaming
Related to elastic/elasticsearch#450

Original commit: elastic/x-pack-elasticsearch@d84fc8e85f
2015-08-18 17:29:09 +02:00
David Pilato 7b10f36775 [maven] rename artifactIds from `elasticsearch-something` to `something`
When https://github.com/elastic/elasticsearch/pull/12879 will be merged, this commit should be merged as well.

```
[INFO] Reactor Summary:
[INFO]
[INFO] Elasticsearch Commercial Plugin Build Resources .... SUCCESS [  0.228 s]
[INFO] Elasticsearch X-Plugins - Parent POM ............... SUCCESS [  0.282 s]
[INFO] X-Plugins: License: Parent POM ..................... SUCCESS [  0.089 s]
[INFO] X-Plugins: License: Core ........................... SUCCESS [  0.118 s]
[INFO] X-Plugins: License: Licensor ....................... SUCCESS [  0.150 s]
[INFO] X-Plugins: License: Plugin API ..................... SUCCESS [  0.106 s]
[INFO] X-Plugins: License: Plugin ......................... SUCCESS [  0.112 s]
[INFO] X-Plugins: Shield .................................. SUCCESS [  0.234 s]
[INFO] X-Plugins: Watcher ................................. SUCCESS [  0.264 s]
[INFO] X-Plugins: Marvel .................................. SUCCESS [  0.113 s]
[INFO] QA: Parent POM ..................................... SUCCESS [  0.097 s]
[INFO] QA: Smoke Test X-Plugins ........................... SUCCESS [  0.107 s]
[INFO] QA: Shield core REST tests ......................... SUCCESS [  0.093 s]
[INFO] QA: Smoke Test Watcher's Shield integration ........ SUCCESS [  0.109 s]
```

Original commit: elastic/x-pack-elasticsearch@e9871261cf
2015-08-18 13:55:11 +02:00
Ryan Ernst dbaf3166ef Fix compile, NetworkUtils get hostname and address methods changed
Original commit: elastic/x-pack-elasticsearch@64a94930dd
2015-08-18 00:13:23 -07:00
Martijn van Groningen 59fdd54dbc Fixed compile error due to upstream change.
Original commit: elastic/x-pack-elasticsearch@a07877571c
2015-08-17 13:44:59 +02:00
Martijn van Groningen d7665293cb Changed pom version to 2.1.0-SNAPSHOT
as ES core does in its master branch

Original commit: elastic/x-pack-elasticsearch@fc9b1a7327
2015-08-17 13:44:33 +02:00
Adrien Grand b8666f0bca Merge pull request elastic/elasticsearch#441 from jpountz/fix/shield_core_rest_tests_to_qa
Tests: Move Shield "run core REST tests" to qa.

Original commit: elastic/x-pack-elasticsearch@4040a1766a
2015-08-14 11:23:40 +02:00
Adrien Grand 06d84f00e4 Tests: Move Shield "run core REST tests" to qa.
Close elastic/elasticsearch#404

Original commit: elastic/x-pack-elasticsearch@1250e1449e
2015-08-14 11:18:11 +02:00
uboness c8b83daf44 Removed plugin specific version classes
Now that the versions are aligned with ES version, we can just use the es `Version` class. Version compatibility is applied by the `PluginService`.

Closes elastic/elasticsearch#439

Original commit: elastic/x-pack-elasticsearch@32f305abb8
2015-08-13 17:54:38 +02:00
uboness c4e213fc92 Updated version to 2.0.0-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@8fb8035596
2015-08-13 00:05:11 +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
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
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 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
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
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
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 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 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
jaymode 462d1b335f fix shield integration tests
Original commit: elastic/x-pack-elasticsearch@fb063b5ad1
2015-07-31 14:20:18 -04:00
debadair 25d7dfa555 Added step-by-step instructions for using Kibana with Shield. Closes elastic/elasticsearch#283.
Original commit: elastic/x-pack-elasticsearch@f3aab8e6a4
2015-07-31 09:38:24 -07:00
Tanguy Leroux 101ea6deab Remove usage of Streams.copyToBytesFromClasspath()
Original commit: elastic/x-pack-elasticsearch@8f813e9275
2015-07-31 16:37:30 +02:00
jaymode 3713b3dfdd use NetworkUtils instead of InetAddress.getLocalHost
Prior to this commit, we were InetAddress.getLocalHost() to get the hostname and host
address when auditing. This is different than how we report the node's hostname and host
address in other places where we use NetworkUtils. This caused false failures to be seen
with the IndexAuditTrail tests. This commit switches the audit trails to use the NetworkUtils
methods.

Closes elastic/elasticsearch#285

Original commit: elastic/x-pack-elasticsearch@c0bd7e94f6
2015-07-31 09:42:01 -04:00
Suyog Rao 63a04169a2 Docs: Add PKI auth support for Logstash http protocol
Closes elastic/elasticsearch#328

Original commit: elastic/x-pack-elasticsearch@04235e714a
2015-07-30 14:05:59 -07:00
jaymode 4b779b6fd6 allow ldap user search connection pool creation to be retried if it fails on startup
Today, if a LDAP server is down and the LDAP realm uses the user search mechanism this will prevent the
node from starting up. This is not ideal because users can still authenticate with another realm if it is
configured. This change tries to create the connection pool on initialization but if it fails, creation will retried
on each attempted authentication until the server is available again.

Closes elastic/elasticsearch#107

Original commit: elastic/x-pack-elasticsearch@f2ccf858ff
2015-07-30 14:24:52 -04:00
Alexander Reelsen 7ec8a7ab27 CLI tool: Fix exit status changes
In elastic/elasticsearch#12165 the return value of the CLITool was changed from an integer
to the ExitStatus enum. This commit adapts the cli tools of x-plugins.

Original commit: elastic/x-pack-elasticsearch@fc6478bfa5
2015-07-30 16:06:54 +02:00
jaymode 52be1aa943 [Test] mute the cat node attributes rest test
The integration tests do not have any node attributes so the body that is returned is empty
and causes the test to fail.

Original commit: elastic/x-pack-elasticsearch@ad846796f1
2015-07-30 07:03:03 -04:00
jaymode d3cbea6f4c use correct cluster state when starting index audit trail
Currently, we use the local cluster state when determining if the index audit trail can be
started. This is correct when we are logging to the same cluster but is incorrect when we
log to a remote cluster. Instead we should try to initialize the client and get the remote
cluster's state.

This also changes the enqueue method to stop throwing an exception on failing to add a
message to the queue. The exception was unnecessary and causing hard to read logs.
It is now replaced with a simple warn log message.

Closes elastic/elasticsearch#317

Original commit: elastic/x-pack-elasticsearch@238e9159b3
2015-07-28 12:37:51 -04:00
jaymode 5de2b799e0 don't attach audit user to remote requests and fix rest origin address
Currently, we attach the internal audit user to all requests. This is incorrect for requests that
need to be sent to a remote cluster. For these cases, we should require a user to be defined
to access the remote cluster if it is protected by Shield.

Additionally, the origin_address field for rest request fields is formatted differently than other
address fields. This changes the field to only be the remote address.

Closes elastic/elasticsearch#278
Closes elastic/elasticsearch#279

Original commit: elastic/x-pack-elasticsearch@a5f86b1974
2015-07-28 12:37:51 -04:00
Alexander Reelsen bf2f1e35ea Testing: Fix copying of files in shield integration tests
In order to correctly copy the license plugin version, we have
to enable useBaseVersion in order to strip the snapshot version
number.

Original commit: elastic/x-pack-elasticsearch@025da92c35
2015-07-28 16:55:07 +02:00
jaymode 7e78f09a1d update shield limitations around document level security
Original commit: elastic/x-pack-elasticsearch@4afbf69ce2
2015-07-27 13:25:19 -04:00
Martijn van Groningen 3abe6e02d6 fixed compile error due to an upstream change in the MetaData class
Original commit: elastic/x-pack-elasticsearch@b74276d43c
2015-07-24 22:26:36 +02:00
Alexander Reelsen ba5900cf0b Documentation: Fix calls for bin/plugin to be compatible with master
Original commit: elastic/x-pack-elasticsearch@e9ce3f401c
2015-07-24 12:24:44 +02:00
jaymode 92e6d301f2 [Test] don't use the shard AnalyzeAction when checking action mapping
Original commit: elastic/x-pack-elasticsearch@6501695edf
2015-07-24 06:08:24 -04:00
jaymode 1e63141bf2 update ShieldActionMapper to handle the change to use TransportSingleShardAction
This relates to commit cafc7078e2 in elasticsearch

Original commit: elastic/x-pack-elasticsearch@72f8a92b80
2015-07-23 13:55:48 -04:00
Robert Muir 4b5faf00ac Add description elements to pom.xml's for plugins, it goes in their metadata file
Original commit: elastic/x-pack-elasticsearch@753f7a67f4
2015-07-22 21:57:30 -04:00
jaymode 3d74a68e00 shield publishes the zip for internal deployments and x-dev-tools doesn't need a parent
This removes the parent from x-dev-tools because we won't be publishing this artifact to sonatype's repository.

Original commit: elastic/x-pack-elasticsearch@013efb50e9
2015-07-22 12:23:18 -04:00
jaymode d7d8ca125a load shield for external cluster client
Original commit: elastic/x-pack-elasticsearch@96e8df2ac3
2015-07-22 10:25:20 -04:00
jaymode 187be6c602 tell shield tests to explicitly load shield and license plugins
Original commit: elastic/x-pack-elasticsearch@4f70d6ee93
2015-07-22 10:01:44 -04:00
Robert Muir de61163c1b add back shield assembly
Original commit: elastic/x-pack-elasticsearch@14c7d7ea8e
2015-07-22 09:31:51 -04:00
Robert Muir 360a302511 fix test compilation
Original commit: elastic/x-pack-elasticsearch@53074ee0c1
2015-07-22 09:10:34 -04:00
Robert Muir d68f94b859 give license plugin its assembly back
Original commit: elastic/x-pack-elasticsearch@ec972de2b5
2015-07-22 09:06:04 -04:00
Robert Muir 0cd1aa5aa2 get build (kinda) working
Original commit: elastic/x-pack-elasticsearch@c230faf732
2015-07-22 08:49:20 -04:00
jaymode cc7fe390eb [[getting-started-with-shield]] back to [[getting-started]]
The redirect has been removed that was causing a loop. This reverts commit elastic/x-pack@546d4d4205.

Original commit: elastic/x-pack-elasticsearch@f9fb88a9d0
2015-07-21 13:43:52 -04:00
jaymode a676a1199f release notes for Shield 1.3.1 and 1.2.3
Original commit: elastic/x-pack-elasticsearch@027b905d80
2015-07-21 11:08:55 -04:00
jaymode dbca30808f update index privilege to include shard action for indices:data/write/update
Original commit: elastic/x-pack-elasticsearch@d10b763c91
2015-07-21 10:22:53 -04:00
jaymode b54d9f9f3c add 1.3.1 and 1.2.3 to shield version
Original commit: elastic/x-pack-elasticsearch@02b798fa15
2015-07-21 10:10:35 -04:00
jaymode db0b745fa6 finish cleaning up exceptions
This commit finishes the exception cleanup and resolves the TODOs that were left from
the last set of exception changes and re-enables all muted tests.

Closes elastic/elasticsearch#5

Original commit: elastic/x-pack-elasticsearch@742fa948ce
2015-07-21 06:52:22 -04:00
debadair 91786f4662 Stated that node client is unsupported, removed node client config info, and edited the transport client config section. Closes elastic/elasticsearch#906
Original commit: elastic/x-pack-elasticsearch@9bbd6726a8
2015-07-20 10:51:06 -07:00
Clinton Gormley cbeb6fdd66 Renamed [[getting-started]] to [[getting-started-with-shield]] to avoid 301 redirect
Closes elastic/elasticsearch#303

Original commit: elastic/x-pack-elasticsearch@84b535a68c
2015-07-20 14:14:45 +02:00
jaymode 4f1aaa8882 [docs] change `active-directory` to `active_directory`
In the documentation reorgantization for Shield, the type of the active directory realm changed
and is not valid. Users are configuring Shield incorrectly and running into issues because of
this. This changes the realm type to the correct value.

Closes elastic/elasticsearch#291

Original commit: elastic/x-pack-elasticsearch@7f8b65eda7
2015-07-17 19:07:52 -04:00
jaymode a2c23cdc6f update the active directory cert in the testnode keystore
Original commit: elastic/x-pack-elasticsearch@8b3d65896d
2015-07-17 08:45:39 -04:00
jaymode 41799e44a4 blacklist rest test with no indices since shield changes the behavior
Original commit: elastic/x-pack-elasticsearch@1a58146296
2015-07-17 08:17:38 -04:00
jaymode 5ac477fbb7 add shard stores api to known actions/handlers
Original commit: elastic/x-pack-elasticsearch@8f3bad4f80
2015-07-17 07:58:05 -04:00
jaymode b3c1e3a34c add new active directory certificate
Original commit: elastic/x-pack-elasticsearch@ad902dcd57
2015-07-17 07:53:36 -04:00
Clinton Gormley 7d986eb295 Docs: Fixed bad link to disk allocation in ES 1.7
Original commit: elastic/x-pack-elasticsearch@8abbf7468b
2015-07-16 16:07:45 +02:00
jaymode f95f86764c shield rest tests use the ElasticsearchRestTestCase nodeSettings
Original commit: elastic/x-pack-elasticsearch@855014dd4b
2015-07-16 06:19:57 -04:00
Clinton Gormley d6d13661e8 Docs: Fix bad ID in Shield intro
Original commit: elastic/x-pack-elasticsearch@61b72d57ae
2015-07-16 10:46:52 +02:00
jaymode 4619e71af1 remove dependency on license zip in test scope and update integration test xml
Original commit: elastic/x-pack-elasticsearch@c7b4f67b3f
2015-07-15 14:02:59 -04:00
debadair 79e12ad65b Docs: Revised the Shield intro to be more Shield-centric.
Original commit: elastic/x-pack-elasticsearch@ba7d73fd61
2015-07-15 10:38:38 -07:00
debadair dce7c48f67 Docs: Reorganized Shield TOC, renamed files, cleaned up hierarchy.
Original commit: elastic/x-pack-elasticsearch@15caf307c4
2015-07-15 10:17:17 -07:00
Robert Muir 4626fdfcaa remove cruft
Original commit: elastic/x-pack-elasticsearch@b51b9685b6
2015-07-14 14:10:31 -04:00
Robert Muir a225d3434d Remove redundant dependencies
Original commit: elastic/x-pack-elasticsearch@6a50cb8b01
2015-07-14 13:55:58 -04:00
Robert Muir 5305d46c32 remove redundant plugins
Original commit: elastic/x-pack-elasticsearch@543789fc55
2015-07-14 13:43:55 -04:00
Robert Muir 35b14612b0 Hook in x-dev-tools properly
Original commit: elastic/x-pack-elasticsearch@1f439bb5e9
2015-07-14 13:29:18 -04:00
Robert Muir 62615ae60c Remove more redundancy
Original commit: elastic/x-pack-elasticsearch@9721e8707c
2015-07-14 13:04:25 -04:00
Robert Muir cd24eeb5a3 fix compile failures (IndexMissingException -> IndexNotFoundException)
Original commit: elastic/x-pack-elasticsearch@c61492d962
2015-07-14 11:52:30 -04:00
Robert Muir 1d2be681f7 fix shield tests
Original commit: elastic/x-pack-elasticsearch@2b521a705b
2015-07-14 10:12:08 -04:00
Robert Muir 3b63e22dce Get shield integ tests working. Watcher still has assembly issues
Original commit: elastic/x-pack-elasticsearch@68d221d776
2015-07-14 09:45:06 -04:00
uboness cef77541a4 initial merge of the build for all the sub modules
Original commit: elastic/x-pack-elasticsearch@f084b626ce
2015-07-14 12:52:25 +02:00
uboness 8babe1c456 initial migration of shield
Original commit: elastic/x-pack-elasticsearch@2bf095d3cb
2015-07-13 12:31:34 +02:00