From bd3a16a97db72cfd062dd4c05d033df0a615f9ab Mon Sep 17 00:00:00 2001 From: wachowskij Date: Thu, 24 Nov 2016 12:32:16 +0100 Subject: [PATCH] Uprade ELK tarballs * Kibana 4.4.0 -> 4.6.3 * ElasticSearch 2.2.0 -> 2.4.2 * LogStash 2.2.0 -> 2.4.1 Change-Id: I73d8990a35a5a0220050e4e0302d66afb3176bd9 --- devstack/files/kibana/kibana.yml | 1 + devstack/files/tempest/tempest.conf | 2 +- devstack/settings | 6 +++--- monasca_log_api_tempest/README.md | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/devstack/files/kibana/kibana.yml b/devstack/files/kibana/kibana.yml index 8f8ef5a2..7cc4b100 100644 --- a/devstack/files/kibana/kibana.yml +++ b/devstack/files/kibana/kibana.yml @@ -74,5 +74,6 @@ logging.verbose: true fts-keystone.port: %KEYSTONE_AUTH_PORT% fts-keystone.url: %KEYSTONE_AUTH_PROTOCOL%://%KEYSTONE_AUTH_HOST% fts-keystone.enabled: True +fts-keystone.cookie.isSecure: False optimize.useBundleCache: False diff --git a/devstack/files/tempest/tempest.conf b/devstack/files/tempest/tempest.conf index 87c02006..8d87ce5f 100644 --- a/devstack/files/tempest/tempest.conf +++ b/devstack/files/tempest/tempest.conf @@ -30,7 +30,7 @@ use_ssl = False auth_version = v3 uri = http://127.0.0.1:5000/v2.0/ uri_v3 = http://127.0.0.1:35357/v3/ -kibana_version = 4.4.0 +kibana_version = 4.6.3 [auth] diff --git a/devstack/settings b/devstack/settings index aa605309..6d3d73c5 100644 --- a/devstack/settings +++ b/devstack/settings @@ -27,9 +27,9 @@ enable_service monasca-log-metrics enable_service monasca-log-agent # libraries/frameworks/projects monasca-log requires to install itself -KIBANA_VERSION=${KIBANA_VERSION:-4.4.0-linux-x64} -LOGSTASH_VERSION=${LOGSTASH_VERSION:-2.2.0} -ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-2.2.0} +KIBANA_VERSION=${KIBANA_VERSION:-4.6.3-linux-x86_64} +LOGSTASH_VERSION=${LOGSTASH_VERSION:-2.4.1} +ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-2.4.2} NODE_JS_VERSION=${NODE_JS_VERSION:-"4.0.0"} NVM_VERSION=${NVM_VERSION:-"0.32.1"} diff --git a/monasca_log_api_tempest/README.md b/monasca_log_api_tempest/README.md index 4ea85ab7..6e57415d 100644 --- a/monasca_log_api_tempest/README.md +++ b/monasca_log_api_tempest/README.md @@ -71,7 +71,7 @@ running the following command: force_tenant_isolation = False allow_tenant_isolation = False disable_ssl_certificate_validation = True - kibana_version = 4.4.0 + kibana_version = 4.6.3 [auth] allow_tenant_isolation = true