From 2fe0eaf26b637c9c19d5afb25ac8b7bca7afd803 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 2 Nov 2023 12:15:41 +0100 Subject: [PATCH] Added kafka exporter --- argocd/configserver/test/Chart.lock | 6 +++--- argocd/configserver/test/Chart.yaml | 2 +- argocd/kafka/test/Chart.lock | 9 ++++++--- argocd/kafka/test/Chart.yaml | 3 +++ argocd/kafka/test/overwrite_values.yaml | 6 +++++- argocd/kafka/test/values.yaml | 12 ++++++++++++ helm/kafka/Chart.lock | 6 +++--- helm/kafka/Chart.yaml | 8 ++++---- 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/argocd/configserver/test/Chart.lock b/argocd/configserver/test/Chart.lock index df1737d..ecfb6f6 100644 --- a/argocd/configserver/test/Chart.lock +++ b/argocd/configserver/test/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: template repository: https://repo.2martens.de/charts - version: 0.1.20 -digest: sha256:0dc0ae3940fcb77a1365662fbd85659802a680c27fa6c1543c7b391c168d581e -generated: "2023-11-02T11:57:17.734311+01:00" + version: 0.1.21 +digest: sha256:1a1078b145cf212b0c37f57c763e8bfbec57159520e6ecee5c2e3f6021e31084 +generated: "2023-11-02T12:10:54.325529+01:00" diff --git a/argocd/configserver/test/Chart.yaml b/argocd/configserver/test/Chart.yaml index 7be55e4..3946670 100644 --- a/argocd/configserver/test/Chart.yaml +++ b/argocd/configserver/test/Chart.yaml @@ -4,5 +4,5 @@ version: 0.1.0 type: application dependencies: - name: template - version: 0.1.20 + version: 0.1.21 repository: https://repo.2martens.de/charts diff --git a/argocd/kafka/test/Chart.lock b/argocd/kafka/test/Chart.lock index f2d7da8..8f098b2 100644 --- a/argocd/kafka/test/Chart.lock +++ b/argocd/kafka/test/Chart.lock @@ -1,6 +1,9 @@ dependencies: - name: template repository: https://repo.2martens.de/charts - version: 0.1.20 -digest: sha256:0dc0ae3940fcb77a1365662fbd85659802a680c27fa6c1543c7b391c168d581e -generated: "2023-11-02T12:00:20.54589+01:00" + version: 0.1.21 +- name: prometheus-kafka-exporter + repository: https://prometheus-community.github.io/helm-charts + version: 2.7.0 +digest: sha256:42e1bb034e5627e07db96f607d04c3df20b04c98a2d1c7e9ec81843943fcbf37 +generated: "2023-11-02T12:15:06.472721+01:00" diff --git a/argocd/kafka/test/Chart.yaml b/argocd/kafka/test/Chart.yaml index c6a4ce7..ee84e63 100644 --- a/argocd/kafka/test/Chart.yaml +++ b/argocd/kafka/test/Chart.yaml @@ -6,3 +6,6 @@ dependencies: - name: template version: 0.1.21 repository: https://repo.2martens.de/charts + - name: prometheus-kafka-exporter + version: 2.7.0 + repository: https://prometheus-community.github.io/helm-charts \ No newline at end of file diff --git a/argocd/kafka/test/overwrite_values.yaml b/argocd/kafka/test/overwrite_values.yaml index edfacac..f8196f0 100644 --- a/argocd/kafka/test/overwrite_values.yaml +++ b/argocd/kafka/test/overwrite_values.yaml @@ -15,4 +15,8 @@ environment: - name: KAFKA_INTER_BROKER_LISTENER_NAME value: PLAINTEXT - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR - value: "1" \ No newline at end of file + value: "1" + +prometheus-kafka-exporter: + kafkaServer: + - kafka.kafka:9092 \ No newline at end of file diff --git a/argocd/kafka/test/values.yaml b/argocd/kafka/test/values.yaml index e977e21..16b35d0 100644 --- a/argocd/kafka/test/values.yaml +++ b/argocd/kafka/test/values.yaml @@ -2,6 +2,8 @@ # the default for your application differs. The image.repository is a prime candidate for that. replicaCount: 1 +# revisionHistoryLimit: can be configured to reduce/increase amount of stored replica sets for rollback +revisionHistoryLimit: 10 image: repository: confluentinc/cp-kafka pullPolicy: IfNotPresent @@ -48,6 +50,13 @@ application: zookeeper: host: zookeeper port: 2181 +prometheus: + enabled: false + # only enable if you have the Prometheus operator installed, otherwise it will fail due to missing CRDs + useCRDs: false + # namespace: the namespace of the Prometheus installation + # the value is templated + namespace: # Overwrite with application specific environment variables # Each item has key and value, where the value is parsed as a template environment: @@ -136,3 +145,6 @@ affinity: {} podSpec: {} # containerSpec: will be added at the bottom of the container specification in the pod template containerSpec: {} +prometheus-kafka-exporter: + kafkaServer: + - kafka.kafka:9092 diff --git a/helm/kafka/Chart.lock b/helm/kafka/Chart.lock index 78b4407..2cca5eb 100644 --- a/helm/kafka/Chart.lock +++ b/helm/kafka/Chart.lock @@ -4,6 +4,6 @@ dependencies: version: 2.7.0 - name: template repository: file://../template - version: 0.1.20 -digest: sha256:2c2a71a4a41b338b87fab0a2e26454bc68f4fde9983c4635236a006a088b6f89 -generated: "2023-11-02T12:02:09.048349+01:00" + version: 0.1.21 +digest: sha256:0d86a5d1eb9435a2c68d5acf4e31899cd8b50329052236feff2476d01a405b1c +generated: "2023-11-02T12:12:13.425908+01:00" diff --git a/helm/kafka/Chart.yaml b/helm/kafka/Chart.yaml index 4ad4351..785845e 100644 --- a/helm/kafka/Chart.yaml +++ b/helm/kafka/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kafka description: Simple Kafka chart to get started type: application -version: 0.1.4 +version: 0.1.5 maintainers: - name: Jim Martens url: https://2martens.de @@ -11,12 +11,12 @@ dependencies: version: 2.7.0 repository: https://prometheus-community.github.io/helm-charts - name: template - version: 0.1.20 + version: 0.1.21 repository: file://../template annotations: artifacthub.io/changes: | - - kind: added - description: Added Prometheus support + - kind: fixed + description: Fixed syntax error artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc