Commit Graph

21 Commits

Author SHA1 Message Date
uboness a4c505ceb1 Changed the Marvel module name to Marvel Agent
- this results in a `marvel-agent-2.0.0.zip` artifact, to better differentiate it from the kibana marvel plugin
- post 2.0 when we move the marvel kibana codebase to x-plugins we'll need to differentiate between these two modules anyway.

Closes elastic/elasticsearch#846

Original commit: elastic/x-pack-elasticsearch@6b6a76f7dd
2015-10-21 14:03:23 +02:00
uboness c2c7cbf2f5 updated LICENSE.txt and NOTES.txt
Closes elastic/elasticsearch#837
Closes elastic/elasticsearch#310

Original commit: elastic/x-pack-elasticsearch@164817c0c8
2015-10-20 14:58:36 +02:00
Alexander Reelsen d90f29ad98 Marvel: Dont skip deployment
This had been disabled in the past due to marvel not being ready, but needs
to be reenabled to make sure marvel is released.

Original commit: elastic/x-pack-elasticsearch@269d5623d0
2015-10-20 14:06:33 +02:00
Tanguy Leroux 2f1c88a633 Marvel: Use mock web server in HttpExporterTests
Original commit: elastic/x-pack-elasticsearch@b69b28af90
2015-10-09 09:33:55 +02:00
uboness 334e090902 Shield Integration
- Adds internal `__marvel_user`
- Adds a `SecuredClient` that binds the internal marvel user to all requests it sends

Original commit: elastic/x-pack-elasticsearch@77c4716261
2015-09-26 04:30:33 +02:00
Ryan Ernst fbbd3f6c2d Add warning suppressions
I fixed a couple more warnings and added suppressions, so that when
 elastic/elasticsearchelastic/elasticsearch#13410 lands, x-plugins will not break.

Original commit: elastic/x-pack-elasticsearch@8a19b2b71b
2015-09-09 12:45:20 -07:00
uboness 533c14242f Bumped the version to 3.0.0-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@0771b3e589
2015-09-04 16:30:11 +02:00
Alexander Reelsen 8934f3436b Marvel: Ensure marvel is not deployed
In order to not accidentally release marvel in its current state
this removes marvel in the S3 upload as well as not deploying
marvel to artifactory.

Original commit: elastic/x-pack-elasticsearch@cb6088e18b
2015-09-04 11:00:37 +02:00
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
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
uboness c4e213fc92 Updated version to 2.0.0-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@8fb8035596
2015-08-13 00:05:11 +02: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
jaymode 6a479a6dc8 apply the useBaseVersion fix to marvel as well
Original commit: elastic/x-pack-elasticsearch@b749d78e76
2015-07-28 13:20:42 -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
Robert Muir 0cd1aa5aa2 get build (kinda) working
Original commit: elastic/x-pack-elasticsearch@c230faf732
2015-07-22 08:49:20 -04:00
Tanguy Leroux deb6391c10 Marvel: Add integration test
Closes elastic/elasticsearch#314

Original commit: elastic/x-pack-elasticsearch@9c5d3ab862
2015-07-21 21:42:13 +02:00
jaymode 89fa3d5a59 disable integration tests for marvel
See elastic/elasticsearch#314

Original commit: elastic/x-pack-elasticsearch@5e5811853d
2015-07-21 13:06:32 -04:00
Tanguy Leroux 99dc9784cc Marvel: add configuration for integration tests
Original commit: elastic/x-pack-elasticsearch@6161a64d13
2015-07-21 14:51:00 +02:00
Tanguy Leroux a1870b70bf Marvel: update project integration in x-plugins
Minor fixes to finish Marvel's agent integration into x-plugins project

Original commit: elastic/x-pack-elasticsearch@5fd9501893
2015-07-21 10:40:52 +02:00
uboness 37c0b627e7 migration of marvel agent 2.0
Original commit: elastic/x-pack-elasticsearch@6cd0a7d25c
2015-07-17 18:43:12 +02:00