style: clean up monitor config

- Use YAML anchor
- Use template for name and namespace

bootstrap/argocd/values.yaml

@@ -50,31 +50,15 @@ argo-cd:
         - secretName: argocd-tls-certificate
           hosts:
             - *host
-    metrics:
+    metrics: &metrics
       enabled: true
       serviceMonitor:
         enabled: true
-
   controller:
-    metrics:
+    metrics: *metrics
-      enabled: true
-      serviceMonitor:
-        enabled: true
-
   repoServer:
-    metrics:
+    metrics: *metrics
-      enabled: true
-      serviceMonitor:
-        enabled: true
-  
   redis:
-    metrics:
+    metrics: *metrics
-      enabled: true
-      serviceMonitor:
-        enabled: true
-  
   dex:
-    metrics:
+    metrics: *metrics
-      enabled: true
-      serviceMonitor:
-        enabled: true

system/ingress-nginx/values.yaml

@@ -2,12 +2,9 @@ ingress-nginx:
   controller:
     admissionWebhooks:
       timeoutSeconds: 30
-    
     metrics:
       enabled: true
-
       serviceMonitor:
         enabled: true
-        
   tcp:
     22: gitea/gitea-ssh:22

system/loki/values.yaml

@@ -1,5 +1,3 @@
 loki:
   serviceMonitor:
     enabled: true
-    annotations: {}
-    # scrapeTimeout: 10s

system/longhorn-system/templates/servicemonitor.yaml

@@ -2,14 +2,14 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: longhorn
+  name: {{ .Release.Name }}
-  namespace: longhorn-system
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels:
       app: longhorn-manager
   namespaceSelector:
     matchNames:
-      - longhorn-system
+      - {{ .Release.Namespace }}
   endpoints:
     - port: manager