Add kafka metrics (#337)

Signed-off-by: Edward Zeng <jie.zeng@zilliz.com>
shanghaikid · Jun 17, 2022 · 7671b29 · 7671b29
1 parent 98e3f26
commit 7671b29
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
@@ -3,7 +3,7 @@ name: milvus
 appVersion: "2.0.2"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
-version: 3.0.23
+version: 3.0.24
 keywords:
   - milvus
   - elastic

diff --git a/charts/milvus/requirements.lock b/charts/milvus/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: etcd
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami
   version: 6.3.3
 - name: minio
   repository: https://milvus-io.github.io/milvus-helm
@@ -11,5 +11,5 @@ dependencies:
 - name: kafka
   repository: https://charts.bitnami.com/bitnami
   version: 15.5.1
-digest: sha256:6f7dac7840a8b00b76a0bb819094cb5ea287dd0021902f08ba769c12d6b4847e
-generated: "2022-03-23T14:45:09.223015+08:00"
+digest: sha256:2e382d3ff91f947e0f6e18bc8957f57df533275d68c9bc1254f64e87cd24ec19
+generated: "2022-06-17T16:32:31.532131+08:00"
diff --git a/charts/milvus/requirements.yaml b/charts/milvus/requirements.yaml
@@ -1,7 +1,7 @@
 dependencies:
 - name: etcd
   version: 6.3.3
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami
   condition: etcd.enabled
   tags:
     - etcd

diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml
@@ -663,12 +663,25 @@ kafka:
     size: 300Gi
 
   metrics:
+    ## Prometheus Kafka exporter: exposes complimentary metrics to JMX exporter
     kafka:
       enabled: false
       image:
         repository: bitnami/kafka-exporter
         tag: 1.4.2-debian-10-r182
 
+    ## Prometheus JMX exporter: exposes the majority of Kafkas metrics
+    jmx:
+      enabled: false
+      image:
+        repository: bitnami/jmx-exporter
+        tag: 0.16.1-debian-10-r245
+
+    ## To enable serviceMonitor, you must enable either kafka exporter or jmx exporter.
+    ## And you can enable them both
+    serviceMonitor:
+      enabled: false
+
   service:
     type: ClusterIP
     ports:

diff --git a/ct.yaml b/ct.yaml
@@ -6,4 +6,5 @@ chart-repos:
   - apache=https://pulsar.apache.org/charts
   - bitnami=https://charts.bitnami.com/bitnami
   - incubator=https://charts.helm.sh/incubator
+  - bitnami-pre-2022=https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami
 helm-extra-args: --timeout 900s