From 82fe04dcbd1d6aa23997f702fafbf08cc969521d Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Thu, 4 Jun 2020 09:55:55 +0200
Subject: [PATCH] Let Helm deploy service monitor for Kafka Lag Exporter based
on Helm template
---
.../infrastructure/kafka-lag-exporter/install.sh | 0
.../kafka-lag-exporter/service-monitor.yaml | 15 ---------------
.../infrastructure/kafka-lag-exporter/values.yaml | 6 ++++--
3 files changed, 4 insertions(+), 17 deletions(-)
mode change 100644 => 100755 execution/infrastructure/kafka-lag-exporter/install.sh
delete mode 100644 execution/infrastructure/kafka-lag-exporter/service-monitor.yaml
diff --git a/execution/infrastructure/kafka-lag-exporter/install.sh b/execution/infrastructure/kafka-lag-exporter/install.sh
old mode 100644
new mode 100755
diff --git a/execution/infrastructure/kafka-lag-exporter/service-monitor.yaml b/execution/infrastructure/kafka-lag-exporter/service-monitor.yaml
deleted file mode 100644
index 141dd96f9..000000000
--- a/execution/infrastructure/kafka-lag-exporter/service-monitor.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
- labels:
- app: kafka-lag-exporter
- appScope: titan-ccp
- name: kafka-lag-exporter
-spec:
- selector:
- matchLabels:
- #app: cp-kafka
- jobLabel: kafka-lag-exporter
- endpoints:
- - port: http
- interval: 5s
\ No newline at end of file
diff --git a/execution/infrastructure/kafka-lag-exporter/values.yaml b/execution/infrastructure/kafka-lag-exporter/values.yaml
index 8e31cc9fd..bbd9f5fc3 100644
--- a/execution/infrastructure/kafka-lag-exporter/values.yaml
+++ b/execution/infrastructure/kafka-lag-exporter/values.yaml
@@ -7,8 +7,10 @@ pollIntervalSeconds: 15
prometheus:
serviceMonitor:
- enabled: false
+ enabled: true
interval: "30s"
+ additionalLabels:
+ appScope: titan-ccp
# service monitor label selectors: https://github.com/helm/charts/blob/f5a751f174263971fafd21eee4e35416d6612a3d/stable/prometheus-operator/templates/prometheus/prometheus.yaml#L74
# additionalLabels:
- # prometheus: k8s
+ # prometheus: k8s
\ No newline at end of file
--
GitLab