From 85dff3d6ab5906deaac40bcd6de7fb89d763686a Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@zohomail.com>
Date: Mon, 29 May 2023 21:38:39 +0200
Subject: [PATCH] Add Gitea to prometheus

---
 badhouseplants/values/secrets.prometheus.yaml |  8 ++---
 badhouseplants/values/values.gitea.yaml       |  4 +++
 badhouseplants/values/values.prometheus.yaml  | 32 +++++++++++++++----
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/badhouseplants/values/secrets.prometheus.yaml b/badhouseplants/values/secrets.prometheus.yaml
index 399c170..8e23981 100644
--- a/badhouseplants/values/secrets.prometheus.yaml
+++ b/badhouseplants/values/secrets.prometheus.yaml
@@ -1,9 +1,9 @@
 grafana:
-    adminPassword: ENC[AES256_GCM,data:gxI2S/KxstCmLKTeAqRESo4p9sMImVqUDA==,iv:/5aKhPxCeEN22juQPwLBaM8n3AAjV9axxuZ1NZbZ9IM=,tag:PmCtctTjZIXlgXyDA7G4yQ==,type:str]
+    adminPassword: ENC[AES256_GCM,data:AuPGLXN861DvndWdecukXKzt91sGGIMBToj7tO3J,iv:gKmj0gurV77e/jbxdyxhaxkmmsp738vB6ZAfzRFf45M=,tag:rKOkedx87g4MlRk6npgXiA==,type:str]
     adminUser: ENC[AES256_GCM,data:Esh/6bXMez8=,iv:cRdvkpnO8gNOaKy+4kPcq69ksdXxuZClnjSvBp4yto8=,tag:ZgycOsDXJIT1mrN6nJHw3g==,type:str]
     grafana.ini:
         auth.generic_oauth:
-            client_secret: ENC[AES256_GCM,data:7/PqroaClfcd6kTHm+oljOA/r6FGq5EXnv5BRsrMRsaHhX0AzPLMk7Z/sc6SuP5iR+Xysa8/Y/o=,iv:vdZKOA4MsQjMnmKsAT0QA+E3WaAQXoIItVsznlbXZ68=,tag:sbuDV8RkAcZiGuxkytu3XQ==,type:str]
+            client_secret: ENC[AES256_GCM,data:+4Qfo4aR9TMZprWL9U6lFx4B86d3ywH2O5K6rM5hmv2gROeFinp7k5p9C2pgNubIK9W3TlWSZAw=,iv:uFX2Lz3s2/aR5rcwsDvfuUGbKHNxh43ZiuCNaT5b1dw=,tag:8YdsVMaHbP6wqjubb9Ab2w==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -19,8 +19,8 @@ sops:
             NXQ5SjNQUW9JOStDclZuYUlqV3FaWWsKvu2T2LmDjuJgnB0djjhJczsvDjFsH/D/
             QDPkkl2G1luDoIjBj21uoy0daqfyskd4Yw2ZsPsZU6zuEGdFj52Qbw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-05-28T06:39:30Z"
-    mac: ENC[AES256_GCM,data:21m+X5uMwQSBEVsV+x+flobNlcPJRXF50IfbfzVoW4C/Tt+77gasD+Lq9A4q+U3lbRm59FO0R0u8puONM0MfM7QFTJyevZKGVGQFOMEnOHwv4s9w5WNMTZszPopcWRFuM+6rRvoWypr0hTVGKFpIQ/asfGdqxHGPf8Rdq5OPU9M=,iv:BtU0CckuX9F/MJe+31TA3oLAGOZlZis5AIKY40uYRgc=,tag:nDZI0kaXx7alFU3qEafQmA==,type:str]
+    lastmodified: "2023-05-29T11:41:00Z"
+    mac: ENC[AES256_GCM,data:7Xs7W6smDPr8fp4AapKcUvHUsYRKkTQ3wb4CuDmL0ziQs2d73ueezEembp7RRaBQ/Q5jACY1dHQg42+4YymcTt8NqJ6SE4G7f9iqJu3rr5g5lh8mYP8ft8J1/l2jrQtCSfxyzuG2CPZRycQIo+0Tq++w6iK0iy6ExPt8cDNR2Ao=,iv:v8m4CEW6FG5rWV8fKsqACh37X9yzsB/Bl1wh+4348rI=,tag:Up71zDf12JMDjK8uIxnsLA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml
index 2523a61..7c16864 100644
--- a/badhouseplants/values/values.gitea.yaml
+++ b/badhouseplants/values/values.gitea.yaml
@@ -63,6 +63,10 @@ ingress:
   enabled: false
 
 gitea:
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
   config:
     APP_NAME: Bad Houseplants Gitea
     ui:
diff --git a/badhouseplants/values/values.prometheus.yaml b/badhouseplants/values/values.prometheus.yaml
index 10b48bc..ddb0acd 100644
--- a/badhouseplants/values/values.prometheus.yaml
+++ b/badhouseplants/values/values.prometheus.yaml
@@ -26,13 +26,13 @@ prometheus:
       any: true
     serviceMonitorSelector: {}
     serviceMonitorSelectorNilUsesHelmValues: false
-    storageSpec: 
-     volumeClaimTemplate:
-       spec:
-         accessModes: ["ReadWriteOnce"]
-         resources:
-           requests:
-             storage: 5Gi
+    storageSpec:
+      volumeClaimTemplate:
+        spec:
+          accessModes: ["ReadWriteOnce"]
+          resources:
+            requests:
+              storage: 5Gi
 grafana:
   persistence:
     enabled: true
@@ -55,3 +55,21 @@ grafana:
       tls_skip_verify_insecure: false
       use_pkce: true
       role_attribute_path: contains(groups, 'badhouseplants:owners') && 'Admin' || 'Viewer'
+  dashboardProviders:
+    dashboardproviders.yaml:
+      apiVersion: 1
+      providers:
+        - name: 'default'
+          orgId: 1
+          folder: ''
+          type: file
+          disableDeletion: true
+          editable: false
+          options:
+            path: /var/lib/grafana/dashboards/default
+  dashboards:
+    default:
+      gitea-dashboard:
+        gnetId: 13192
+        revision: 1
+        datasource: Prometheus