enhance ServiceMonitor (#63)

horizoncd · Jul 19, 2023 · 039b300 · 039b300
1 parent be44c3f
commit 039b300
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/charts/horizon/Chart.yaml b/charts/horizon/Chart.yaml
@@ -4,7 +4,7 @@ description: A CICD DevOps Platform
 
 type: application
 
-version: 2.2.6
+version: 2.2.7
 appVersion: v2.4.2
 dependencies:
   - name: common

diff --git a/charts/horizon/templates/core/core-servicemonitor.yaml b/charts/horizon/templates/core/core-servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.core.monitor.enabled }}
+{{- if .Values.core.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -8,9 +8,18 @@ metadata:
     component: core
 spec:
   endpoints:
-    - interval: 30s
-      path: /metrics
-      port: http
+    - port: http
+      path: {{ .Values.core.serviceMonitor.path }}
+      {{- with .Values.core.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.core.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      {{- if .Values.core.serviceMonitor.relabelings }}
+      relabelings:
+      {{- toYaml .Values.core.serviceMonitor.relabelings | nindent 4 }}
+      {{- end }}
   selector:
     matchLabels:
 {{ include "horizon.labels" . | indent 6 }}

diff --git a/charts/horizon/values.yaml b/charts/horizon/values.yaml
@@ -119,7 +119,7 @@ core:
   additionalLabels: {}
   image:
     repository: horizoncd/horizon-core
-    tag: 
+    tag:
   args:
     loglevel:
   securityContext:
@@ -142,8 +142,13 @@ core:
   envs: {}
   extraVolumeMounts: []
   extraVolumes: []
-  monitor:
+  serviceMonitor:
     enabled: false
+    path: /metrics
+    interval: 1m
+    scrapeTimeout: 30s
+    relabelings: []
+
   grafanaDashboards:
     - name: pod
       value: |