From 25e34cf77f03299aacfe2628a7e42904efb60768 Mon Sep 17 00:00:00 2001
From: Khue Doan <mail@khuedoan.com>
Date: Sat, 8 Jan 2022 12:50:08 +0700
Subject: [PATCH] style: clean up monitor config
- Use YAML anchor
- Use template for name and namespace
---
bootstrap/argocd/values.yaml | 26 ++++---------------
system/ingress-nginx/values.yaml | 3 ---
system/loki/values.yaml | 2 --
.../templates/servicemonitor.yaml | 6 ++---
4 files changed, 8 insertions(+), 29 deletions(-)
diff --git a/bootstrap/argocd/values.yaml b/bootstrap/argocd/values.yaml
index 43419a81..e1dbcfb5 100644
--- a/bootstrap/argocd/values.yaml
+++ b/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:
- enabled: true
- serviceMonitor:
- enabled: true
-
+ metrics: *metrics
repoServer:
- metrics:
- enabled: true
- serviceMonitor:
- enabled: true
-
+ metrics: *metrics
redis:
- metrics:
- enabled: true
- serviceMonitor:
- enabled: true
-
+ metrics: *metrics
dex:
- metrics:
- enabled: true
- serviceMonitor:
- enabled: true
+ metrics: *metrics
diff --git a/system/ingress-nginx/values.yaml b/system/ingress-nginx/values.yaml
index 62441f63..75be6ef1 100644
--- a/system/ingress-nginx/values.yaml
+++ b/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
diff --git a/system/loki/values.yaml b/system/loki/values.yaml
index d454a0b1..fbd8fbd1 100644
--- a/system/loki/values.yaml
+++ b/system/loki/values.yaml
@@ -1,5 +1,3 @@
loki:
serviceMonitor:
enabled: true
- annotations: {}
- # scrapeTimeout: 10s
diff --git a/system/longhorn-system/templates/servicemonitor.yaml b/system/longhorn-system/templates/servicemonitor.yaml
index bad3faca..ff0239e1 100644
--- a/system/longhorn-system/templates/servicemonitor.yaml
+++ b/system/longhorn-system/templates/servicemonitor.yaml
@@ -2,14 +2,14 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
- name: longhorn
- namespace: longhorn-system
+ name: {{ .Release.Name }}
+ namespace: {{ .Release.Namespace }}
spec:
selector:
matchLabels:
app: longhorn-manager
namespaceSelector:
matchNames:
- - longhorn-system
+ - {{ .Release.Namespace }}
endpoints:
- port: manager