From 268f0e4c9f22b4ecbf4b02cc021a5222d9432339 Mon Sep 17 00:00:00 2001
From: Piotr Parczewski <piotr@stackhpc.com>
Date: Mon, 22 Mar 2021 22:19:41 +0100
Subject: [PATCH] Disable usage collection in Kibana

This commit disables collection of usage data in Kibana by default.
User has still an option to enable it via GUI. Reference: [1]

[1] https://www.elastic.co/guide/en/kibana/7.x/telemetry-settings-kbn.html

Change-Id: Ic3a8bf05a73fb042ae42cbd26ccced60240d8e94
---
 ansible/roles/kibana/templates/kibana.yml.j2                 | 1 +
 .../notes/disable-kibana-telemetry-46de5aaf2fc7c186.yaml     | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 releasenotes/notes/disable-kibana-telemetry-46de5aaf2fc7c186.yaml

diff --git a/ansible/roles/kibana/templates/kibana.yml.j2 b/ansible/roles/kibana/templates/kibana.yml.j2
index 3cc3ecac53..59facc17fa 100644
--- a/ansible/roles/kibana/templates/kibana.yml.j2
+++ b/ansible/roles/kibana/templates/kibana.yml.j2
@@ -6,6 +6,7 @@ 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' }}"
+telemetry.optIn: false
 {% if openstack_cacert | length > 0 %}
 elasticsearch.ssl.certificateAuthorities: {{ openstack_cacert }}
 {% endif %}
diff --git a/releasenotes/notes/disable-kibana-telemetry-46de5aaf2fc7c186.yaml b/releasenotes/notes/disable-kibana-telemetry-46de5aaf2fc7c186.yaml
new file mode 100644
index 0000000000..c665420a2c
--- /dev/null
+++ b/releasenotes/notes/disable-kibana-telemetry-46de5aaf2fc7c186.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Disables usage collection (telemetry) in Kibana by default. User has still
+    an option to enable it via GUI.