This is an automated email from the ASF dual-hosted git repository.
jonzeolla pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push:
new e4d793a METRON-1932 Update ES and Kibana to 5.6.14 (JonZeolla) closes
apache/metron#1296
e4d793a is described below
commit e4d793a55a56a01fa101c8da77d92f99325ba539
Author: JonZeolla <[email protected]>
AuthorDate: Tue Dec 18 15:30:09 2018 -0500
METRON-1932 Update ES and Kibana to 5.6.14 (JonZeolla) closes
apache/metron#1296
---
dependencies_with_url.csv | 25 ++++++++++---------
metron-deployment/Kerberos-manual-setup.md | 2 +-
.../ansible/roles/ambari_master/defaults/main.yml | 2 +-
metron-deployment/packaging/ambari/README.md | 28 +++++++++++-----------
.../ELASTICSEARCH/{5.6.2 => 5.6.14}/metainfo.xml | 4 ++--
.../{5.6.2 => 5.6.14}/repos/repoinfo.xml | 0
.../KIBANA/{5.6.2 => 5.6.14}/metainfo.xml | 4 ++--
.../{5.6.2 => 5.6.14}/quicklinks/quicklinks.json | 0
.../KIBANA/{5.6.2 => 5.6.14}/repos/repoinfo.xml | 0
.../configuration/elastic-env.xml | 0
.../configuration/elastic-jvm-options.xml | 0
.../configuration/elastic-site.xml | 0
.../configuration/elastic-sysconfig.xml | 0
.../configuration/elastic-systemd.xml | 0
.../ELASTICSEARCH/{5.6.2 => 5.6.14}/metainfo.xml | 8 +++----
.../package/scripts/elastic_commands.py | 0
.../package/scripts/elastic_master.py | 0
.../package/scripts/elastic_slave.py | 0
.../{5.6.2 => 5.6.14}/package/scripts/params.py | 0
.../package/scripts/properties_config.py | 0
.../package/scripts/service_check.py | 0
.../package/scripts/status_params.py | 0
.../package/templates/elasticsearch.master.yaml.j2 | 0
.../package/templates/elasticsearch.slave.yaml.j2 | 0
.../package/templates/elasticsearch_limits.conf.j2 | 0
.../{5.6.2 => 5.6.14}/quicklinks/quicklinks.json | 0
.../{5.6.2 => 5.6.14}/role_command_order.json | 0
.../{5.6.2 => 5.6.14}/configuration/kibana-env.xml | 0
.../configuration/kibana-site.xml | 0
.../KIBANA/{5.6.2 => 5.6.14}/metainfo.xml | 8 +++----
.../{5.6.2 => 5.6.14}/package/scripts/common.py | 0
.../package/scripts/kibana_master.py | 0
.../{5.6.2 => 5.6.14}/package/scripts/params.py | 0
.../{5.6.2 => 5.6.14}/quicklinks/quicklinks.json | 0
.../src/main/resources/mpack.json | 6 ++---
.../packaging/ambari/metron-mpack/README.md | 4 ++--
.../scripts/dashboard/dashboard-bulkload.json | 2 +-
.../metron-mpack/src/main/resources/mpack.json | 4 ++--
metron-platform/metron-elasticsearch/README.md | 10 ++++----
.../elasticsearch/client/ElasticsearchClient.java | 2 +-
pom.xml | 2 +-
41 files changed, 57 insertions(+), 54 deletions(-)
diff --git a/dependencies_with_url.csv b/dependencies_with_url.csv
index 0a63922..5462a12 100644
--- a/dependencies_with_url.csv
+++ b/dependencies_with_url.csv
@@ -434,16 +434,16 @@
io.netty:netty-resolver:jar:4.1.13.Final:compile,ASLv2,http://netty.io/
io.netty:netty-transport:jar:4.1.13.Final:compile,ASLv2,http://netty.io/
joda-time:joda-time:jar:2.9.5:compile,ASLv2,https://github.com/JodaOrg/joda-time
net.sf.jopt-simple:jopt-simple:jar:5.0.2:compile,The MIT
License,http://jopt-simple.sourceforge.net
-org.elasticsearch.client:elasticsearch-rest-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.client:transport:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch:elasticsearch:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.client:elasticsearch-rest-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.client:transport:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch:elasticsearch:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
org.elasticsearch:jna:jar:4.4.0-1:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.plugin:lang-mustache-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.plugin:parent-join-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.plugin:percolator-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.plugin:reindex-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.plugin:transport-netty3-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.plugin:transport-netty4-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.plugin:lang-mustache-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.plugin:parent-join-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.plugin:percolator-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.plugin:reindex-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.plugin:transport-netty3-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.plugin:transport-netty4-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
org.elasticsearch:securesm:jar:1.1:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
org.hdrhistogram:HdrHistogram:jar:2.1.9:compile,BSD,https://github.com/HdrHistogram/HdrHistogram/blob/master/LICENSE.txt
com.trendmicro:tlsh:jar:3.7.1:compile,ASLv2,https://github.com/trendmicro/tlsh
@@ -487,6 +487,9 @@ org.sonatype.sisu:sisu-inject-plexus:jar:2.2.2:compile
com.zaxxer:HikariCP:jar:2.7.8:compile,ASLv2,https://github.com/brettwooldridge/HikariCP
org.hibernate.validator:hibernate-validator:jar:6.0.9.Final:compile,ASLv2,https://github.com/hibernate/hibernate-validator
com.github.palindromicity:simple-syslog-5424:jar:0.0.9:compile,ASLv2,https://github.com/palindromicity/simple-syslog-5424
-org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
-org.elasticsearch.plugin:aggs-matrix-stats-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
+org.elasticsearch.plugin:aggs-matrix-stats-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
org.fusesource.jansi:jansi:jar:1.16:compile,ASLv2,https://github.com/fusesource/jansi/blob/master/license.txt
+com.vividsolutions:jts:jar:1.13:compile
+joda-time:joda-time:jar:2.10:compile
+org.elasticsearch:securesm:jar:1.2:compile
diff --git a/metron-deployment/Kerberos-manual-setup.md
b/metron-deployment/Kerberos-manual-setup.md
index 6d40552..ecb0cb7 100644
--- a/metron-deployment/Kerberos-manual-setup.md
+++ b/metron-deployment/Kerberos-manual-setup.md
@@ -588,7 +588,7 @@ X-Pack
$METRON_HOME/bin/start_elasticsearch_topology.sh
```
-1. Restart the metron-rest service, and make sure the
elasticsearch-xpack-shaded-5.6.2.jar is in the METRON_REST_CLASSPATH when the
metron-rest starts.
+1. Restart the metron-rest service, and make sure the
elasticsearch-xpack-shaded-5.6.14.jar is in the METRON_REST_CLASSPATH when the
metron-rest starts.
Once you've performed these steps, you should be able to start seeing data in
your ES indexes.
diff --git a/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
b/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
index eb3cd43..cb05dc5 100644
--- a/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
+++ b/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
@@ -19,6 +19,6 @@ ambari_server_mem: 2048
ambari_mpack_version: 0.7.0.0
metron_mpack_name: metron_mpack-{{ ambari_mpack_version }}.tar.gz
metron_mpack_path: "{{ playbook_dir
}}/../../packaging/ambari/metron-mpack/target/{{ metron_mpack_name }}"
-elasticsearch_mpack_version: 5.6.2
+elasticsearch_mpack_version: 5.6.14
elasticsearch_mpack_name: elasticsearch_mpack-{{ ambari_mpack_version }}.tar.gz
elasticsearch_mpack_path: "{{ playbook_dir
}}/../../packaging/ambari/elasticsearch-mpack/target/{{
elasticsearch_mpack_name }}"
diff --git a/metron-deployment/packaging/ambari/README.md
b/metron-deployment/packaging/ambari/README.md
index 410c403..14dd5ca 100644
--- a/metron-deployment/packaging/ambari/README.md
+++ b/metron-deployment/packaging/ambari/README.md
@@ -510,7 +510,7 @@ The main steps for upgrading a service are split into
add-on and common services
e.g.
```
-
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2
+
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14
```
1. Update metainfo.xml
@@ -518,14 +518,14 @@ The main steps for upgrading a service are split into
add-on and common services
Change the version number and package name in
`metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/${YOUR_VERSION_NUMBER_HERE}/metainfo.xml`,
e.g.
```
- <version>5.6.2</version>
+ <version>5.6.14</version>
...
<osSpecifics>
<osSpecific>
<osFamily>any</osFamily>
<packages>
<package>
- <name>elasticsearch-5.6.2</name>
+ <name>elasticsearch-5.6.14</name>
</package>
</packages>
</osSpecific>
@@ -543,7 +543,7 @@ The main steps for upgrading a service are split into
add-on and common services
e.g.
```
-
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2
+
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.14
```
1. Update repoinfo.xml
@@ -565,8 +565,8 @@ The main steps for upgrading a service are split into
add-on and common services
```
<name>ELASTICSEARCH</name>
- <version>5.6.2</version>
- <extends>common-services/ELASTICSEARCH/5.6.2</extends>
+ <version>5.6.14</version>
+ <extends>common-services/ELASTICSEARCH/5.6.14</extends>
```
#### Update mpack.json
@@ -578,7 +578,7 @@ The main steps for upgrading a service are split into
add-on and common services
"service_versions_map": [
{
"service_name" : "ELASTICSEARCH",
- "service_version" : "5.6.2",
+ "service_version" : "5.6.14",
"applicable_stacks" : [
...
]
@@ -603,7 +603,7 @@ The main steps for upgrading a service are split into
add-on and common services
e.g.
```
-
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/5.6.2
+
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/5.6.14
```
1. Update metainfo.xml
@@ -611,12 +611,12 @@ The main steps for upgrading a service are split into
add-on and common services
Change the version number and package name in
`metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/${YOUR_VERSION_NUMBER_HERE}/metainfo.xml`,
e.g.
```
- <version>5.6.2</version>
+ <version>5.6.14</version>
...
<packages>
...
<package>
- <name>kibana-5.6.2</name>
+ <name>kibana-5.6.14</name>
</package>
</packages>
```
@@ -632,7 +632,7 @@ The main steps for upgrading a service are split into
add-on and common services
e.g.
```
-
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/5.6.2
+
metron/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/addon-services/KIBANA/5.6.14
```
1. Update repoinfo.xml
@@ -661,8 +661,8 @@ The main steps for upgrading a service are split into
add-on and common services
Also make sure to update the "extends" version to point to the updated
common-services version, e.g.
```
<name>KIBANA</name>
- <version>5.6.2</version>
- <extends>common-services/KIBANA/5.6.2</extends>
+ <version>5.6.14</version>
+ <extends>common-services/KIBANA/5.6.14</extends>
```
#### Update mpack.json
@@ -674,7 +674,7 @@ The main steps for upgrading a service are split into
add-on and common services
"service_versions_map": [
{
"service_name" : "KIBANA",
- "service_version" : "5.6.2",
+ "service_version" : "5.6.14",
"applicable_stacks" : [
...
]
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/metainfo.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.14/metainfo.xml
similarity index 90%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/metainfo.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.14/metainfo.xml
index accf7da..f992ff4 100755
---
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/metainfo.xml
+++
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.14/metainfo.xml
@@ -22,8 +22,8 @@
<services>
<service>
<name>ELASTICSEARCH</name>
- <version>5.6.2</version>
- <extends>common-services/ELASTICSEARCH/5.6.2</extends>
+ <version>5.6.14</version>
+ <extends>common-services/ELASTICSEARCH/5.6.14</extends>
</service>
</services>
</metainfo>
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/repos/repoinfo.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.14/repos/repoinfo.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.2/repos/repoinfo.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/ELASTICSEARCH/5.6.14/repos/repoinfo.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.2/metainfo.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.14/metainfo.xml
similarity index 90%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.2/metainfo.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.14/metainfo.xml
index 8a4fba2..55cf211 100755
---
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.2/metainfo.xml
+++
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.14/metainfo.xml
@@ -22,8 +22,8 @@
<services>
<service>
<name>KIBANA</name>
- <version>5.6.2</version>
- <extends>common-services/KIBANA/5.6.2</extends>
+ <version>5.6.14</version>
+ <extends>common-services/KIBANA/5.6.14</extends>
</service>
</services>
</metainfo>
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.2/quicklinks/quicklinks.json
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.14/quicklinks/quicklinks.json
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.2/quicklinks/quicklinks.json
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.14/quicklinks/quicklinks.json
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.2/repos/repoinfo.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.14/repos/repoinfo.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.2/repos/repoinfo.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/addon-services/KIBANA/5.6.14/repos/repoinfo.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-env.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-env.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-env.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-env.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-jvm-options.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-jvm-options.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-jvm-options.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-jvm-options.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-site.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-site.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-site.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-site.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-sysconfig.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-sysconfig.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-sysconfig.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-sysconfig.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-systemd.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-systemd.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/configuration/elastic-systemd.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/configuration/elastic-systemd.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/metainfo.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/metainfo.xml
similarity index 94%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/metainfo.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/metainfo.xml
index 47abb45..942af42 100755
---
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/metainfo.xml
+++
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/metainfo.xml
@@ -22,7 +22,7 @@
<name>ELASTICSEARCH</name>
<displayName>Elasticsearch</displayName>
<comment>Indexing and Search</comment>
- <version>5.6.2</version>
+ <version>5.6.14</version>
<components>
<component>
<name>ES_MASTER</name>
@@ -52,7 +52,7 @@
<osFamily>redhat6</osFamily>
<packages>
<package>
- <name>elasticsearch-5.6.2</name>
+ <name>elasticsearch-5.6.14</name>
</package>
</packages>
</osSpecific>
@@ -60,7 +60,7 @@
<osFamily>redhat7</osFamily>
<packages>
<package>
- <name>elasticsearch-5.6.2</name>
+ <name>elasticsearch-5.6.14</name>
</package>
</packages>
</osSpecific>
@@ -68,7 +68,7 @@
<osFamily>ubuntu14</osFamily>
<packages>
<package>
- <name>elasticsearch=5.6.2</name>
+ <name>elasticsearch=5.6.14</name>
</package>
</packages>
</osSpecific>
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/elastic_commands.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_commands.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/elastic_commands.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_commands.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/elastic_master.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_master.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/elastic_master.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_master.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/elastic_slave.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_slave.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/elastic_slave.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_slave.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/params.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/params.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/params.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/params.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/properties_config.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/properties_config.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/properties_config.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/properties_config.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/service_check.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/service_check.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/service_check.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/service_check.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/status_params.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/status_params.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/status_params.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/status_params.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/templates/elasticsearch.master.yaml.j2
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/templates/elasticsearch.master.yaml.j2
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/templates/elasticsearch.master.yaml.j2
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/templates/elasticsearch.master.yaml.j2
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/templates/elasticsearch.slave.yaml.j2
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/templates/elasticsearch.slave.yaml.j2
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/templates/elasticsearch.slave.yaml.j2
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/templates/elasticsearch.slave.yaml.j2
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/templates/elasticsearch_limits.conf.j2
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/templates/elasticsearch_limits.conf.j2
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/templates/elasticsearch_limits.conf.j2
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/templates/elasticsearch_limits.conf.j2
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/quicklinks/quicklinks.json
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/quicklinks/quicklinks.json
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/quicklinks/quicklinks.json
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/quicklinks/quicklinks.json
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/role_command_order.json
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/role_command_order.json
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/role_command_order.json
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/role_command_order.json
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/configuration/kibana-env.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/configuration/kibana-env.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/configuration/kibana-env.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/configuration/kibana-env.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/configuration/kibana-site.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/configuration/kibana-site.xml
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/configuration/kibana-site.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/configuration/kibana-site.xml
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/metainfo.xml
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/metainfo.xml
similarity index 94%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/metainfo.xml
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/metainfo.xml
index b542c54..cb1f559 100755
---
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/metainfo.xml
+++
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/metainfo.xml
@@ -22,7 +22,7 @@
<name>KIBANA</name>
<displayName>Kibana</displayName>
<comment>Kibana Dashboard</comment>
- <version>5.6.2</version>
+ <version>5.6.14</version>
<components>
<component>
<name>KIBANA_MASTER</name>
@@ -44,7 +44,7 @@
<name>python-elasticsearch</name>
</package>
<package>
- <name>kibana-5.6.2</name>
+ <name>kibana-5.6.14</name>
</package>
</packages>
</osSpecific>
@@ -55,7 +55,7 @@
<name>python-elasticsearch</name>
</package>
<package>
- <name>kibana-5.6.2</name>
+ <name>kibana-5.6.14</name>
</package>
</packages>
</osSpecific>
@@ -63,7 +63,7 @@
<osFamily>ubuntu14</osFamily>
<packages>
<package>
- <name>kibana=5.6.2</name>
+ <name>kibana=5.6.14</name>
</package>
</packages>
</osSpecific>
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/package/scripts/common.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/common.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/package/scripts/common.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/common.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/package/scripts/kibana_master.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/kibana_master.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/package/scripts/kibana_master.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/kibana_master.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/package/scripts/params.py
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/params.py
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/package/scripts/params.py
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/params.py
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/quicklinks/quicklinks.json
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/quicklinks/quicklinks.json
similarity index 100%
rename from
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.2/quicklinks/quicklinks.json
rename to
metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/quicklinks/quicklinks.json
diff --git
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/mpack.json
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/mpack.json
index 1b5400c..43c4d26 100644
---
a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/mpack.json
+++
b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/mpack.json
@@ -1,7 +1,7 @@
{
"type": "full-release",
"name": "elasticsearch-ambari.mpack",
- "version": "5.6.2",
+ "version": "5.6.14",
"description": "Ambari Management Pack for Elasticsearch and Kibana",
"prerequisites": {
"min-ambari-version": "2.4.0.0",
@@ -25,7 +25,7 @@
"service_versions_map": [
{
"service_name" : "KIBANA",
- "service_version" : "5.6.2",
+ "service_version" : "5.6.14",
"applicable_stacks" : [
{
"stack_name" : "HDP",
@@ -48,7 +48,7 @@
},
{
"service_name" : "ELASTICSEARCH",
- "service_version" : "5.6.2",
+ "service_version" : "5.6.14",
"applicable_stacks" : [
{
"stack_name" : "HDP",
diff --git a/metron-deployment/packaging/ambari/metron-mpack/README.md
b/metron-deployment/packaging/ambari/metron-mpack/README.md
index cd9399d..3459db2 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/README.md
+++ b/metron-deployment/packaging/ambari/metron-mpack/README.md
@@ -133,10 +133,10 @@ java -cp
$METRON_HOME/lib/metron-elasticsearch-0.4.2-uber.jar org.apache.metron.
~/dashboard-bulkload.json
```
-Locate the "create" command for setting the default index by searching for
"5.6.2". Change "create" to "index" so that it modifies the existing value. It
should look similar to line 1 below.
+Locate the "create" command for setting the default index by searching for
"5.6.14". Change "create" to "index" so that it modifies the existing value. It
should look similar to line 1 below.
```
-{ "index" : { "_id": "5.6.2", "_type": "config" } }
+{ "index" : { "_id": "5.6.14", "_type": "config" } }
{"defaultIndex":"AV-S2e81hKs1cXXnFMqN"}
```
diff --git
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboard-bulkload.json
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboard-bulkload.json
index 037f1c6..90b6cea 100644
---
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboard-bulkload.json
+++
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboard-bulkload.json
@@ -2,7 +2,7 @@
{"title":"*_index_*","timeFieldName":"timestamp","notExpandable":true,"fields":"[{\"name\":\"AA\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"RA\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"RD\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":
[...]
{ "create" : { "_id": "AV-Sj0e2hKs1cXXnFMqF", "_type": "visualization" } }
{"title":"Welcome to Apache Metron","visState":"{\"title\":\"Welcome to Apache
Metron\",\"type\":\"markdown\",\"params\":{\"type\":\"markdown\",\"markdown\":\"This
dashboard enables the validation of Apache Metron and the end-to-end
functioning of its default sensor suite. The default sensor suite includes
[\\n Snort](https://www.snort.org/), [\\n
Bro](https://www.bro.org/), and [\\n
YAF](https://tools.nets [...]
-{ "index" : { "_id": "5.6.2", "_type": "config" } }
+{ "index" : { "_id": "5.6.14", "_type": "config" } }
{"defaultIndex":"AV-S2e81hKs1cXXnFMqN"}
{ "create" : { "_id": "AV-dVurck7f2nZ-iH3Ka", "_type": "visualization" } }
{"title":"Event Count By Type","visState":"{\"title\":\"Event Count By
Type\",\"type\":\"histogram\",\"params\":{\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100},\"title\":{\"text\":\"\"}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"positio
[...]
diff --git
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json
index b96b435..011c407 100644
---
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json
+++
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/mpack.json
@@ -25,7 +25,7 @@
"service_versions_map": [
{
"service_name" : "KIBANA",
- "service_version" : "5.6.2",
+ "service_version" : "5.6.14",
"applicable_stacks" : [
{
"stack_name" : "HDP",
@@ -48,7 +48,7 @@
},
{
"service_name" : "ELASTICSEARCH",
- "service_version" : "5.6.2",
+ "service_version" : "5.6.14",
"applicable_stacks" : [
{
"stack_name" : "HDP",
diff --git a/metron-platform/metron-elasticsearch/README.md
b/metron-platform/metron-elasticsearch/README.md
index 463a0b8..2bb0322 100644
--- a/metron-platform/metron-elasticsearch/README.md
+++ b/metron-platform/metron-elasticsearch/README.md
@@ -21,9 +21,9 @@ limitations under the License.
* [Introduction](#introduction)
* [Properties](#properties)
-* [Upgrading to 5.6.2](#upgrading-to-562)
+* [Upgrading from 2.3.3 to 5.6](#upgrading-from-233-to-56)
* [Type Mappings](#type-mappings)
-* [Using Metron with Elasticsearch 5.6.2](#using-metron-with-elasticsearch-562)
+* [Using Metron with Elasticsearch 5.6](#using-metron-with-elasticsearch-56)
* [Installing Elasticsearch Templates](#installing-elasticsearch-templates)
## Introduction
@@ -102,9 +102,9 @@ __Notes:__
* See
[https://www.elastic.co/guide/en/elasticsearch/client/java-rest/5.6/_common_configuration.html](https://www.elastic.co/guide/en/elasticsearch/client/java-rest/5.6/_common_configuration.html)
for more specifics on the new client properties.
* Other notes on JSSE -
[https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html](https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html)
-## Upgrading to 5.6.2
+## Upgrading from 2.3.3 to 5.6
-Users should be prepared to re-index when migrating from Elasticsearch 2.3.3
to 5.6.2. There are a number of template changes, most notably around
+Users should be prepared to re-index when migrating from Elasticsearch 2.3.3
to 5.6. There are a number of template changes, most notably around
string type handling, that may cause issues when upgrading.
[https://www.elastic.co/guide/en/elasticsearch/reference/5.6/setup-upgrade.html](https://www.elastic.co/guide/en/elasticsearch/reference/5.6/setup-upgrade.html)
@@ -328,7 +328,7 @@ The following is a list of properties that need to be
defined along with their t
* alert_status - keyword
* metron_alert - nested
-## Using Metron with Elasticsearch 5.6.2
+## Using Metron with Elasticsearch 5.6
Although infrequent, sometimes an internal field is added in Metron and
existing templates must be updated. The following steps outlines how to do
this, using `metron_alert` as an example.
diff --git
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/client/ElasticsearchClient.java
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/client/ElasticsearchClient.java
index d62a7c0..4945a8d 100644
---
a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/client/ElasticsearchClient.java
+++
b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/client/ElasticsearchClient.java
@@ -70,7 +70,7 @@ public class ElasticsearchClient implements AutoCloseable{
* client and exposes some additional sugar on top of the low level methods
including marshaling/unmarshaling.
* </p>
* <p>
- * Note, as of 5.6.2 it does NOT support index or cluster management
operations.
+ * Note, as of 5.6 it does NOT support index or cluster management
operations.
*
https://www.elastic.co/guide/en/elasticsearch/client/java-rest/5.6/_changing_the_application_8217_s_code.html
* <br>
* <i>Does not provide indices or cluster management
APIs. Management operations can be executed by external scripts or using the
low-level client.</i>
diff --git a/pom.xml b/pom.xml
index e12a8b0..081adde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
<global_hadoop_version>${base_hadoop_version}</global_hadoop_version>
<global_hbase_version>${base_hbase_version}</global_hbase_version>
<global_flume_version>${base_flume_version}</global_flume_version>
- <global_elasticsearch_version>5.6.2</global_elasticsearch_version>
+ <global_elasticsearch_version>5.6.14</global_elasticsearch_version>
<global_json_simple_version>1.1.1</global_json_simple_version>
<global_metrics_version>3.0.2</global_metrics_version>
<global_junit_version>4.12</global_junit_version>
