openstack
/
monasca-log-api
Code Issues Proposed changes

Merge "Uprade ELK tarballs"

This commit is contained in:
Jenkins 2016-12-14 07:05:58 +00:00 committed by Gerrit Code Review
parent 84fbd86eec bd3a16a97d
commit 1f3ab51187
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/files/kibana/kibana.yml
View File

@ -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

2
devstack/files/tempest/tempest.conf
View File

@ -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]

6
devstack/settings
View File

@ -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"}

2
monasca_log_api_tempest/README.md
View File

@ -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