[tor-commits] [dip/master] Upgrade to elasticsearch 7

[hiro at torproject.org]

commit fc2c101b6362a260b62b9fc7c942d0aee35602ee
Author: Bastian Blank <waldi at debian.org>
Date:   Tue Nov 5 21:14:21 2019 +0100

    Upgrade to elasticsearch 7
---
 roles/system/logs/tasks/elasticsearch.yml                      | 2 +-
 roles/system/logs/templates/elasticsearch/elasticsearch.yml.j2 | 2 +-
 roles/system/logs/templates/kibana/kibana.yml.j2               | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/system/logs/tasks/elasticsearch.yml b/roles/system/logs/tasks/elasticsearch.yml
index 8d68b34..087e1e0 100644
--- a/roles/system/logs/tasks/elasticsearch.yml
+++ b/roles/system/logs/tasks/elasticsearch.yml
@@ -45,7 +45,7 @@
 - name: setup elasticsearch repo
   copy:
     content: |
-      deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main
+      deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main
     dest: /etc/apt/sources.list.d/elasticsearch.list
 
 - name: install elasticsearch
diff --git a/roles/system/logs/templates/elasticsearch/elasticsearch.yml.j2 b/roles/system/logs/templates/elasticsearch/elasticsearch.yml.j2
index d072ec7..59a2f29 100644
--- a/roles/system/logs/templates/elasticsearch/elasticsearch.yml.j2
+++ b/roles/system/logs/templates/elasticsearch/elasticsearch.yml.j2
@@ -2,4 +2,4 @@ cluster.name: {{ external_domain_logs }}
 path.data: /srv/elasticsearch
 path.logs: /var/log/elasticsearch
 bootstrap.memory_lock: false
-network.host: [_site_, _local_]
+network.host: _local_
diff --git a/roles/system/logs/templates/kibana/kibana.yml.j2 b/roles/system/logs/templates/kibana/kibana.yml.j2
index 0450228..e69de29 100644
--- a/roles/system/logs/templates/kibana/kibana.yml.j2
+++ b/roles/system/logs/templates/kibana/kibana.yml.j2
@@ -1 +0,0 @@
-elasticsearch.url: "http://{{ ansible_default_ipv4.address }}:9200"