From 531601b9f59d63a06aebdbe1f2c9e8150d3a7750 Mon Sep 17 00:00:00 2001
From: Sergey Shaykhullin <sergeyshaykhullin@gmail.com>
Date: Thu, 20 May 2021 11:34:25 +0300
Subject: [PATCH] Extract interval and path to values

Signed-off-by: Sergey Shaykhullin <sergeyshaykhullin@gmail.com>
---
 .../argocd-application-controller/servicemonitor.yaml     | 8 ++++++--
 .../templates/argocd-repo-server/servicemonitor.yaml      | 8 ++++++--
 .../argo-cd/templates/argocd-server/servicemonitor.yaml   | 8 ++++++--
 charts/argo-cd/templates/dex/servicemonitor.yaml          | 8 ++++++--
 charts/argo-cd/values.yaml                                | 8 ++++++++
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
index 51f81030..19037c59 100644
--- a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
@@ -17,8 +17,12 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
-      path: /metrics
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.controller.metrics.serviceMonitor.path }}
+      path: {{ . }}
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
index 0b343750..73db755d 100644
--- a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
@@ -17,8 +17,12 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
-      path: /metrics
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.controller.metrics.serviceMonitor.path }}
+      path: {{ . }}
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
index ddf52efa..a1800f22 100644
--- a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
@@ -17,8 +17,12 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
-      path: /metrics
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.controller.metrics.serviceMonitor.path }}
+      path: {{ . }}
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/templates/dex/servicemonitor.yaml b/charts/argo-cd/templates/dex/servicemonitor.yaml
index adc3394a..0d42c79a 100644
--- a/charts/argo-cd/templates/dex/servicemonitor.yaml
+++ b/charts/argo-cd/templates/dex/servicemonitor.yaml
@@ -17,8 +17,12 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
-      path: /metrics
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.controller.metrics.serviceMonitor.path }}
+      path: {{ . }}
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index f1ddd6d3..4e889cd1 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -143,6 +143,8 @@ controller:
       servicePort: 8082
     serviceMonitor:
       enabled: false
+      interval: 30s
+      path: /metrics
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring
@@ -203,6 +205,8 @@ dex:
       labels: {}
     serviceMonitor:
       enabled: false
+      interval: 30s
+      path: /metrics
 
   image:
     repository: quay.io/dexidp/dex
@@ -490,6 +494,8 @@ server:
       servicePort: 8083
     serviceMonitor:
       enabled: false
+      interval: 30s
+      path: /metrics
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring
@@ -838,6 +844,8 @@ repoServer:
       servicePort: 8084
     serviceMonitor:
       enabled: false
+      interval: 30s
+      path: /metrics
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring