From 775eaa1ccaf0e4bbcbfcc937a81f1d62b501472f Mon Sep 17 00:00:00 2001 From: Dispatch CI <56653984+d2iq-dispatch@users.noreply.github.com> Date: Fri, 9 Sep 2022 03:01:48 +0000 Subject: [PATCH 1/2] New prometheus-elasticsearch-exporter version --- .../1.5.x/elasticsearch-exporter-1.yaml | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml diff --git a/addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml b/addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml new file mode 100644 index 0000000..4fca752 --- /dev/null +++ b/addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml @@ -0,0 +1,44 @@ +apiVersion: kubeaddons.mesosphere.io/v1beta2 +kind: Addon +metadata: + name: elasticsearch-exporter + labels: + kubeaddons.mesosphere.io/name: elasticsearch-exporter + kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true" + annotations: + catalog.kubeaddons.mesosphere.io/certification: '["certified"]' + catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-4" + appversion.kubeaddons.mesosphere.io/elasticsearch-exporter: "1.1.0" + values.chart.helm.kubeaddons.mesosphere.io/elasticsearch-exporter: "https://raw.githubusercontent.com/mesosphere/charts/73fba37/stable/elasticsearch-exporter/values.yaml" +spec: + kubernetes: + minSupportedVersion: v1.15.0 + cloudProvider: + - name: aws + enabled: true + - name: azure + enabled: true + - name: gcp + enabled: true + - name: docker + enabled: false + - name: none + enabled: true + requires: + - matchLabels: + kubeaddons.mesosphere.io/name: elasticsearch-oss + chartReference: + chart: prometheus-elasticsearch-exporter + repo: https://prometheus-community.github.io/helm-charts + version: 4.0.0 + values: | + --- + #fullnameOverride: "" + #nameOverride: "" + es: + uri: http://elasticsearch-oss-client:9200 + service: + labels: + servicemonitor.kubeaddons.mesosphere.io/path: "metrics" + metricsPort: + name: metrics From 3224f540a846f4d2027201021e2bcfd1c9ec052b Mon Sep 17 00:00:00 2001 From: Dispatch CI <56653984+d2iq-dispatch@users.noreply.github.com> Date: Fri, 9 Sep 2022 03:01:49 +0000 Subject: [PATCH 2/2] Bump prometheus-elasticsearch-exporter to 4.14.0 --- .../1.5.x/elasticsearch-exporter-1.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml b/addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml index 4fca752..92166cd 100644 --- a/addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml +++ b/addons/elasticsearch-exporter/1.5.x/elasticsearch-exporter-1.yaml @@ -7,30 +7,30 @@ metadata: kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true" annotations: catalog.kubeaddons.mesosphere.io/certification: '["certified"]' - catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-4" - appversion.kubeaddons.mesosphere.io/elasticsearch-exporter: "1.1.0" - values.chart.helm.kubeaddons.mesosphere.io/elasticsearch-exporter: "https://raw.githubusercontent.com/mesosphere/charts/73fba37/stable/elasticsearch-exporter/values.yaml" + catalog.kubeaddons.mesosphere.io/addon-revision: "1.5.0-1" + appversion.kubeaddons.mesosphere.io/elasticsearch-exporter: "1.5.0" + values.chart.helm.kubeaddons.mesosphere.io/elasticsearch-exporter: "https://raw.githubusercontent.com/mesosphere/charts/7fdea63/stable/elasticsearch-exporter/values.yaml" spec: kubernetes: minSupportedVersion: v1.15.0 cloudProvider: - - name: aws - enabled: true - - name: azure - enabled: true - - name: gcp - enabled: true - - name: docker - enabled: false - - name: none - enabled: true + - name: aws + enabled: true + - name: azure + enabled: true + - name: gcp + enabled: true + - name: docker + enabled: false + - name: none + enabled: true requires: - - matchLabels: - kubeaddons.mesosphere.io/name: elasticsearch-oss + - matchLabels: + kubeaddons.mesosphere.io/name: elasticsearch-oss chartReference: chart: prometheus-elasticsearch-exporter repo: https://prometheus-community.github.io/helm-charts - version: 4.0.0 + version: 4.14.0 values: | --- #fullnameOverride: ""