Merge pull request #141 from stackhpc/feature/elk7_victoria

Upgrade service configuration for ELK 7

Author: dougszumski

ansible/roles/elasticsearch/templates/elasticsearch.yml.j2

@@ -5,9 +5,10 @@ node.name: "{{ 'api' | kolla_address | put_address_in_context('url') }}"
 network.host: "{{ 'api' | kolla_address | put_address_in_context('url') }}"
 
 cluster.name: "{{ elasticsearch_cluster_name }}"
+cluster.initial_master_nodes: [{% for host in groups['elasticsearch'] %}"{{ 'api' | kolla_address(host) }}"{% if not loop.last %},{% endif %}{% endfor %}]
 node.master: true
 node.data: true
-discovery.zen.ping.unicast.hosts: [{% for host in groups['elasticsearch'] %}"{{ 'api' | kolla_address(host) | put_address_in_context('url') }}"{% if not loop.last %},{% endif %}{% endfor %}]
+discovery.seed_hosts: [{% for host in groups['elasticsearch'] %}"{{ 'api' | kolla_address(host) | put_address_in_context('url') }}"{% if not loop.last %},{% endif %}{% endfor %}]
 
 discovery.zen.minimum_master_nodes: {{ minimum_master_nodes }}
 http.port: {{ elasticsearch_port }}

ansible/roles/kibana/templates/kibana.json.j2

@@ -1,5 +1,5 @@
 {
-    "command": "/usr/share/kibana/bin/kibana",
+    "command": "/usr/share/kibana/bin/kibana --config /etc/kibana/kibana.yml",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/kibana.yml",

ansible/roles/kibana/templates/kibana.yml.j2

@@ -2,7 +2,7 @@ kibana.defaultAppId: "{{ kibana_default_app_id }}"
 logging.dest: /var/log/kolla/kibana/kibana.log
 server.port: {{ kibana_server_port }}
 server.host: "{{ api_interface_address }}"
-elasticsearch.url: "{{ elasticsearch_internal_endpoint }}"
+elasticsearch.hosts: "{{ elasticsearch_internal_endpoint }}"
 elasticsearch.requestTimeout: {{ kibana_elasticsearch_request_timeout }}
 elasticsearch.shardTimeout: {{ kibana_elasticsearch_shard_timeout }}
 elasticsearch.ssl.verificationMode: "{{ 'full' if kibana_elasticsearch_ssl_verify | bool else 'none' }}"

releasenotes/notes/upgrade-elk-to-7-release-c559d4c5dff05d2f.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Update service configuration for the ELK 7 OSS release. A rolling upgrade
+    from ELK 6 is supported. Please see the official `upgrade notes
+    <https://www.elastic.co/guide/en/elastic-stack/current/upgrading-elastic-stack.html>`__
+    for more detail.