From 5595fff159f5ed358f76685374b35df8e00ad6e6 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Sat, 15 Aug 2020 13:24:14 +0100 Subject: [PATCH] Fix optional prometheus support --- charts/kubezero-logging/delete_zdt-logging.sh | 5 +++++ charts/kubezero-logging/templates/elasticsearch.yaml | 2 ++ 2 files changed, 7 insertions(+) create mode 100755 charts/kubezero-logging/delete_zdt-logging.sh diff --git a/charts/kubezero-logging/delete_zdt-logging.sh b/charts/kubezero-logging/delete_zdt-logging.sh new file mode 100755 index 0000000..0931e5d --- /dev/null +++ b/charts/kubezero-logging/delete_zdt-logging.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# We only need to delete the service monitor and virtual service, others will be taken over by the new chart and we dont loose data +kubectl delete -n logging VirtualService kibana-logging +kubectl delete -n logging ServiceMonitor es-logging diff --git a/charts/kubezero-logging/templates/elasticsearch.yaml b/charts/kubezero-logging/templates/elasticsearch.yaml index 5798c5e..a9dfd27 100644 --- a/charts/kubezero-logging/templates/elasticsearch.yaml +++ b/charts/kubezero-logging/templates/elasticsearch.yaml @@ -16,7 +16,9 @@ spec: node.data: true node.ingest: true node.ml: false + {{- if $.Values.es.prometheus }} prometheus.indices: false + {{- end }} {{- if .zone }} node.attr.zone: {{ .zone }} cluster.routing.allocation.awareness.attributes: zone