Merge pull request #182 from bjwhite-fnal/master

Servers: Enable ServiceMonitor independently of Prometheus.
rucio · Mar 11, 2024 · e0b82c6 · e0b82c6
2 parents d0dae21 + dd0acee
commit e0b82c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/charts/rucio-server/Chart.yaml b/charts/rucio-server/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-server
-version: 33.0.2
+version: 33.0.3
 apiVersion: v1
 description: A Helm chart to deploy servers for Rucio
 keywords:

diff --git a/charts/rucio-server/templates/servicemonitor.yaml b/charts/rucio-server/templates/servicemonitor.yaml
@@ -1,5 +1,5 @@
 {{- if gt .Values.replicaCount 0.0 -}}
-{{- if .Values.monitoring.enabled }}
+{{- if and .Values.monitoring.enabled .Values.monitoring.serviceMonitorEnabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/charts/rucio-server/values.yaml b/charts/rucio-server/values.yaml
@@ -68,6 +68,8 @@ logFormat: '[%{%Y-%m-%d %H:%M:%S}t]\t%v\t%h\t%{X-Forwarded-For}i\t%{X-Rucio-Requ
 
 monitoring:
   enabled: false
+  # default to true to preserve chart behavior
+  serviceMonitorEnabled: true
   exporterPort: 8080
   targetPort: 8080
   nativeMetricsPort: 8081