From e140cea4177c4bcb0cd828f035e21a94bc5f7f7a Mon Sep 17 00:00:00 2001
From: friedrich goerz <friedrich.goerz@netgo.de>
Date: Fri, 10 Feb 2023 14:14:19 +0100
Subject: [PATCH] DEV-878: added some stuff for monitoring s3 storage

---
 Chart.yaml                                    |  4 +--
 ...> netpol_egress-all2prometheuspushgw.yaml} |  2 +-
 templates/servicemonitor_s3_minio.yaml        | 27 +++++++++++++++++++
 values_cusprod.yaml                           |  9 +++++++
 values_cusqa.yaml                             | 11 +++++++-
 values_nsodev.yaml                            | 11 +++++++-
 6 files changed, 59 insertions(+), 5 deletions(-)
 rename templates/{netpol_egress-postgres2prometheuspushgw.yaml => netpol_egress-all2prometheuspushgw.yaml} (91%)
 create mode 100644 templates/servicemonitor_s3_minio.yaml

diff --git a/Chart.yaml b/Chart.yaml
index 7199d7c..3b3c8c2 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -28,10 +28,10 @@ dependencies:
     version: 4.5.4
     repository: oci://prodnso-harbor-01.smardigo.digital/infrastructure
   - name: smardigo-connect
-    version: 0.1.25
+    version: 0.1.26
     repository: oci://prodnso-harbor-01.smardigo.digital/smardigo
   - name: smardigo-worker
-    version: 0.1.11
+    version: 0.1.12
     repository: oci://prodnso-harbor-01.smardigo.digital/smardigo
   - name: smardigo-wordpress
     version: 0.1.23
diff --git a/templates/netpol_egress-postgres2prometheuspushgw.yaml b/templates/netpol_egress-all2prometheuspushgw.yaml
similarity index 91%
rename from templates/netpol_egress-postgres2prometheuspushgw.yaml
rename to templates/netpol_egress-all2prometheuspushgw.yaml
index 5aaee9d..904bb51 100644
--- a/templates/netpol_egress-postgres2prometheuspushgw.yaml
+++ b/templates/netpol_egress-all2prometheuspushgw.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: egress-postgres2prometheuspushgw
+  name: egress-all2prometheuspushgw
 spec:
   podSelector:
     matchLabels:
diff --git a/templates/servicemonitor_s3_minio.yaml b/templates/servicemonitor_s3_minio.yaml
new file mode 100644
index 0000000..b91ec7c
--- /dev/null
+++ b/templates/servicemonitor_s3_minio.yaml
@@ -0,0 +1,27 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: minio
+  labels:
+    release: kube-prometheus-stack
+    v1.min.io/tenant: {{ .Values.tenant.tenant.name }}
+spec:
+  jobLabel: minio
+  selector:
+    matchLabels:
+      v1.min.io/tenant: {{ .Values.tenant.tenant.name }}
+  endpoints:
+    - port: https-minio
+      interval: 30s
+      scrapeTimeout: 10s
+      path: /minio/v2/metrics/cluster
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
+    - port: https-minio
+      interval: 30s
+      scrapeTimeout: 10s
+      path: /minio/v2/metrics/node
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
diff --git a/values_cusprod.yaml b/values_cusprod.yaml
index 9d7407c..9f665b4 100644
--- a/values_cusprod.yaml
+++ b/values_cusprod.yaml
@@ -24,6 +24,15 @@ tenant:
     log:
       audit:
         diskCapacityGB: false
+    env:
+      - name: MINIO_PROMETHEUS_AUTH_TYPE
+        value: "public"
+      - name: MINIO_PROMETHEUS_JOB_ID
+        value: "minio"
+      - name: MINIO_PROMETHEUS_URL
+        value: "http://kube-prometheus-stack-prometheus.monitoring:9090"
+      - name: CONSOLE_PROMETHEUS_URL
+        value: "http://kube-prometheus-stack-prometheus.monitoring:9090"
   ingress:
     api:
       enabled: true
diff --git a/values_cusqa.yaml b/values_cusqa.yaml
index 193c2fd..49093d7 100644
--- a/values_cusqa.yaml
+++ b/values_cusqa.yaml
@@ -24,6 +24,15 @@ tenant:
     log:
       audit:
         diskCapacityGB: false
+    env:
+      - name: MINIO_PROMETHEUS_AUTH_TYPE
+        value: "public"
+      - name: MINIO_PROMETHEUS_JOB_ID
+        value: "minio"
+      - name: MINIO_PROMETHEUS_URL
+        value: "http://kube-prometheus-stack-prometheus.monitoring:9090"
+      - name: CONSOLE_PROMETHEUS_URL
+        value: "http://kube-prometheus-stack-prometheus.monitoring:9090"
   ingress:
     api:
       enabled: true
@@ -140,4 +149,4 @@ egeld24-wordpress:
       nameOverride: mariadb-egeld24
     commonLabels:
       app: wordpress
-      project: egeld24
\ No newline at end of file
+      project: egeld24
diff --git a/values_nsodev.yaml b/values_nsodev.yaml
index 8c361f3..b14fa47 100644
--- a/values_nsodev.yaml
+++ b/values_nsodev.yaml
@@ -24,6 +24,15 @@ tenant:
     log:
       audit:
         diskCapacityGB: false
+    env:
+      - name: MINIO_PROMETHEUS_AUTH_TYPE
+        value: "public"
+      - name: MINIO_PROMETHEUS_JOB_ID
+        value: "minio"
+      - name: MINIO_PROMETHEUS_URL
+        value: "http://kube-prometheus-stack-prometheus.monitoring:9090"
+      - name: CONSOLE_PROMETHEUS_URL
+        value: "http://kube-prometheus-stack-prometheus.monitoring:9090"
   ingress:
     api:
       enabled: true
@@ -123,4 +132,4 @@ smardigo-wordpress:
       project: thgquotenservice
 
 egeld24-wordpress:
-  enabled: false
\ No newline at end of file
+  enabled: false