From 9bf7799e7f91d2e1142be8d6724c8aa9cc7ed8a9 Mon Sep 17 00:00:00 2001 From: Adam Wilhelm Date: Wed, 26 Sep 2018 14:19:05 -0400 Subject: [PATCH] [incubator/Elasticsearch] Allow for enabling monitoring for 6.3+ (#7981) * [incubator/elasicsearch] enable monitoring for 6.3+ systems Signed-off-by: Adam Wilhelm * [incubator/elasicsearch] enable monitoring for 6.3+ systems Signed-off-by: Adam Wilhelm * version bump Signed-off-by: Adam Wilhelm * add back tpl lines Signed-off-by: Adam Wilhelm --- incubator/elasticsearch/Chart.yaml | 2 +- incubator/elasticsearch/README.md | 13 +++++++++++++ incubator/elasticsearch/templates/configmap.yaml | 6 +++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/incubator/elasticsearch/Chart.yaml b/incubator/elasticsearch/Chart.yaml index 11459795b4..c022a2aaeb 100755 --- a/incubator/elasticsearch/Chart.yaml +++ b/incubator/elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ name: elasticsearch home: https://www.elastic.co/products/elasticsearch -version: 1.8.0 +version: 1.8.1 appVersion: 6.4.1 description: Flexible and powerful open source, distributed real-time search and analytics engine. diff --git a/incubator/elasticsearch/README.md b/incubator/elasticsearch/README.md index f6077c13c3..a4932d7b9f 100644 --- a/incubator/elasticsearch/README.md +++ b/incubator/elasticsearch/README.md @@ -167,6 +167,19 @@ Elasticsearch v5 terminology has updated, and now refers to a `Client Node` as a More info: https://www.elastic.co/guide/en/elasticsearch/reference/5.5/modules-node.html#coordinating-node +## Enabling elasticsearch interal monitoring +Requires version 6.3+ and standard non `oss` repository defined. Starting with 6.3 Xpack is partially free and enabled by default. You need to set a new config to enable the collection of these internal metrics. (https://www.elastic.co/guide/en/elasticsearch/reference/6.3/monitoring-settings.html) + +To do this through this helm chart override with the three following changes: +``` +image.repository: docker.elastic.co/elasticsearch/elasticsearch +cluster.xpackEnable: true +cluster.env.XPACK_MONITORING_ENABLED: true +``` + +Note: to see these changes you will need to update your kibana repo to `image.repository: docker.elastic.co/kibana/kibana` instead of the `oss` version + + ## Select right storage class for SSD volumes ### GCE + Kubernetes 1.5 diff --git a/incubator/elasticsearch/templates/configmap.yaml b/incubator/elasticsearch/templates/configmap.yaml index 590b09fe61..df8fd49c9e 100644 --- a/incubator/elasticsearch/templates/configmap.yaml +++ b/incubator/elasticsearch/templates/configmap.yaml @@ -55,7 +55,11 @@ data: ping.unicast.hosts: ${DISCOVERY_SERVICE:} minimum_master_nodes: ${MINIMUM_MASTER_NODES:2} -{{- if .Values.cluster.xpackEnable }} +{{- if (.Values.cluster.xpackEnable) and .Values.appVersion gt 6.3 }} + # see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html + # After 6.3 xpack systems changed and are enabled by default and different configs manage them this enables monitoring + xpack.monitoring.collection.enabled: ${XPACK_MONITORING_ENABLED:false} +{{- else if .Values.cluster.xpackEnable }} # see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html xpack.ml.enabled: ${XPACK_ML_ENABLED:false} xpack.monitoring.enabled: ${XPACK_MONITORING_ENABLED:false}