From 9c3bb065259c36cd043b6b2ca28300c4a6a5e4ed Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Mon, 6 May 2019 14:10:08 -0500 Subject: [PATCH] Fluentd-Exporter: Use bitnami fluentd exporter image This updates the fluentd-exporter to use the bitnami image for the chart instead of a personal image Change-Id: I162dca4556646eb781c380acea307d2feb156d18 --- .../monitoring/prometheus/bin/_fluentd-exporter.sh.tpl | 2 +- fluent-logging/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl b/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl index cc1fdffc4b..a9cd2a3c3b 100644 --- a/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl +++ b/fluent-logging/templates/monitoring/prometheus/bin/_fluentd-exporter.sh.tpl @@ -20,7 +20,7 @@ set -ex COMMAND="${@:-start}" function start () { - exec go-wrapper run -scrape_uri "$FLUENTD_METRICS_HOST" + exec fluentd_exporter --scrape_uri "$FLUENTD_METRICS_HOST" } function stop () { diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml index 7dc301b78e..74b74d0a26 100644 --- a/fluent-logging/values.yaml +++ b/fluent-logging/values.yaml @@ -39,7 +39,7 @@ images: tags: fluentbit: docker.io/fluent/fluent-bit:0.14.2 fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch - prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1 + prometheus_fluentd_exporter: docker.io/bitnami/fluentd-exporter:0.2.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 helm_tests: docker.io/openstackhelm/heat:newton elasticsearch_template: docker.io/openstackhelm/heat:newton