fix kube-prometheus-stack

fix kube-prometheus-stack fix kube-prometheus-stack
2025-09-17 18:24:14 +02:00 · 2020-12-06 01:17:01 +01:00
parent e00149ad07
commit cb08bb9f1f
2 changed files with 17 additions and 48 deletions
--- a/cluster/monitoring/kube-prometheus-stack.yaml
+++ b/cluster/monitoring/kube-prometheus-stack.yaml
@@ -34,29 +34,6 @@ spec:
              resources:
                requests:
                  storage: 10Gi
-      ingress:
-        enabled: true
-        annotations:
-          kubernetes.io/ingress.class: "nginx"
-      config:
-        global:
-          resolve_timeout: 5m
-        receivers:
-        - name: "null"
-        route:
-          receiver: 'pushover'
-          routes:
-            - match:
-                alertname: Watchdog
-              receiver: 'null'
-            - receiver: 'pushover'
-        inhibit_rules:
-        - source_match:
-            severity: 'critical'
-          target_match:
-            severity: 'warning'
-          # Apply inhibition if the alertname is the same.
-          equal: ['alertname', 'namespace']
    nodeExporter:
      serviceMonitor:
        relabelings:
@@ -97,10 +74,6 @@ spec:
        GF_EXPLORE_ENABLED: true
        GF_DISABLE_SANITIZE_HTML: true
        GF_PANELS_DISABLE_SANITIZE_HTML: true
-      ingress:
-        enabled: true
-        annotations:
-          kubernetes.io/ingress.class: "nginx"
      plugins:
      - natel-discrete-panel
      - pr0ps-trackmap-panel
@@ -181,10 +154,6 @@ spec:
    kubeProxy:
      enabled: false
    prometheus:
-      ingress:
-        enabled: true
-        annotations:
-          kubernetes.io/ingress.class: "nginx"
      prometheusSpec:
        replicas: 2
        replicaExternalLabelName: "replica"
--- a/secrets/helmrelease-monitoring-prometheus-stack.yaml
+++ b/secrets/helmrelease-monitoring-prometheus-stack.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    values.yaml: ENC[AES256_GCM,data:g5RiP65rd712xYS6ScRa6HkN2JYiPyKAfeUhgCSb+rMxiYT05Rrg8l0ggVO7vRv9J341hRuG3syNa+J7b0I1FggJPgG5C4vw3OlAurYu0R6xHsE+WmcWGtZY8BOn5O6USGZkHda9z8KZNxjHWpJ4dQuAlSLBf7r1XQ33aV/VpW6loQULFLjjKfO71wkMgt2ViVZ5po8GFP+5SIz1ZN+r9TtFUPFWGQ4dQP5vpGoWmEQir2jnK3lM60hrLQaCeHgAh+3tdSZhlHskjjlXvsi2l7lhA046iP0ypYn6ORT31Dabsa51iCXkADnUMKg7SQSeixTwD180YPTD83Ln5ywhZnKSeAIXqNbmCpiAmYUXQYDtblcG8YKP6d+58m5++wCA5TBoaXmvkvy3H267wmicES+CQFJkz23b8UtJDKDFfa0flpW1fEX+4FfFEjzHFx2IRCzmGrkXO6TtoAth3PEbK5YAbCfPSJa6Yuv+yZpteMOpkAgcmkg7HunH5SeVAAfAp5fJBY/2cAUjzgHdisyyL58YcuyIfa77Sn1ABYGgV6b9ltc+5mo8q2ddYt9RtObvqEgMTzhaTpaI8YGm0U/PYbWpxRR2YW8+15z2UbBDXVHoRpV2kWLugjd00fWyotkQXHYAK2PCKVpOSZ5uiwlW5e6xFVUGb2PkAyqgmrEbXyrvqB8Ca1ansPvhWyfiDFSUP9UaJwXS8U1ku3VyuHfFuIRmPhK1ELyvsE++d9dFNumM2rK2wo77BOcBMdw/80LcVRik/Iuk8rA3PM7QNU72q96cNE5fjz+59CQujtg7oFnhA7c+ZfQ71kKecM2pbATgDC4biO/EJ5g2+9eLh0GJNCK2o345pjc9NzORUiGx1fzwegDaAK0nPaeA4UYuucaV9cUy41v5cHBBEZJVVuc/jJPxYa5mYjd/75FeOROimGg+IohFD0wnRmAuSB70NWNy1yQNjpVCikZNBqr2f/TtdWHgJAVw0AR5wSG20MmalFnTzxOhjtxNE3Jn9LD8KEtTgHB0P3ha+jT9Qu6g7cBhWwS8ckgGlVcyDddI+V/f+UpjPAY6mTCG7eR3CnAnvFguunMvs3ITXbZiAD07CXrooPOBPZv0rdNUuTjs4UjxTzbK3mMuwaYxBhgkIplrbjFEXSYwJONCnOIwjLPjBr8bBbtWo0cLNYk9z1tcqoe6bCArPRP3QRF7/zA83ntksq7xYsvGQKn2yrujsjyueAKjo7EThUSRdjTdahCPHrIBqIeFFeHJS6rSwkJ3WsC1bfZfBGaYTAgjw6MJedGUnEVr+wDWlZ7LivzRt8Ye4Q2fKHBjUz7HDEB9pYN91kV1jE8ueC0G/AgOzVe/T/a1WtbW8b/xDPmNg4KHB1tJIJ7Akqg+Q+N+oHRUvIZmpgnAahUzjWJdAJHQInxZswCiTiRCi66qcXB4SQHvW0EzQDUE0gpoEqruBp7wxStcSjCHUiuRDbOuovUyKXAX1qzfXV+2f/S+OyLWx7Mc6qqxAhyG0+BcB4c71f/Cqu+TtxEyEV5gUVqX23L7WP544UQ7/U4x+UjeJyQxTk8EkzrdZS285BJjKx8291mgfzHnUj2cJzHRRK8t+waSrTxyKw8G/xxdhygg,iv:A/BbHhBWdWBPpg3O2M66sTYqf8aaKZZa2YU8sFAz6Xs=,tag:ZacGXXmC5qcWk3GGWA2IAg==,type:str]
+    values.yaml: ENC[AES256_GCM,data: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,iv:TWyfb6vprKpFNWOlkAKuTHhm5RRitNWUB4+oujqlK/k=,tag:iyFRdgeqfuA9tEz29WncOw==,type:str]
 kind: ConfigMap
 metadata:
    creationTimestamp: null
@@ -11,25 +11,25 @@ sops:
    gcp_kms: []
    azure_kv: []
    hc_vault: []
-    lastmodified: '2020-12-03T10:52:14Z'
-    mac: ENC[AES256_GCM,data:mF9HGZWCodDKdOSy5yuZSz2DJaV2YdXDXo1u5OTRdjDEnSLJiTxnjHaTJCdRf2tdMXazthBWPzRuHVnldaIMHB00IywPlvQH37/X8CJPqcdHLLbvGug7eC73erUusaKYHmjSDSE5Cj+Yyhh/g0ej3+FM1SCVr6K/lgXl6IldipQ=,iv:eS+tIAaU2yoeRMhdwLAk3epNjvXS3f/DRvAun+wShUE=,tag:4XtxBlirInsZu7Vd36ytFg==,type:str]
+    lastmodified: '2020-12-06T00:16:41Z'
+    mac: ENC[AES256_GCM,data:Q3mI4iup9ZNrjg/myh/lvA0N3oEeskHXHPwKJfpzDZjbeBTwnFesRgZ0ejLfBKJgYNPWmlTMByE2O63nK+ZesTbaoZwpItWUqxwNlE4FF9cC9asRz1YbNEPAmGrzTTI3AwSSfdAdDLTFmnYLLuTYVZrtWTRZQqYQpVlsyk7AIok=,iv:SKn26Ptay8100VLMv4AR0gVtLp4yUat2AsN4F4/Rp3U=,tag:4OOZ/EI/kXcFbyKWpg/ckw==,type:str]
    pgp:
-    -   created_at: '2020-12-03T10:52:14Z'
+    -   created_at: '2020-12-06T00:16:40Z'
        enc: |
            -----BEGIN PGP MESSAGE-----

-            hQGMA/JorPHm1g9XAQv9FhG+fD04KAflGnk0eVKd6UbJkVcFafNhaTxabx4rSEOj
-            30+lWivhvgDq0Z/KtVME6gVAUzfaFaR+DIIo5Ocxo6SuEZvKrg24ihyowTwTasHL
-            C+SzqFaj7OfiDNC5mQc/toO7JDaoHvavUVj6Pv7H87GLSLb0UqndrzW1GJxG3LQb
-            jNkZkKbKMWi91V9RTS0YtopntKjb3qEOYu8h6DbzkGQicXKYwTttKUwshPmWUNOe
-            aGogQC3/kzwFJn1d3xsgEqW/nVwgd3pd2BHDzY7IOwEe5COlhOsB5YEXEOI/vuI0
-            pr7tw9MJ/guvJb0IiUxW9cqfSj4HGRaQPZ62A7wHFqgMLaD3uTYZzSj1aNuY3vpH
-            FYPxKYzP5EJdXKNo5kSWyJyHk9t3/GSt7rkwiYGoq9dsSxXOMx5ZvNCL61Tgg2jQ
-            8vrRMGcoo0gkSkN1bWK3PmVIpELEeEjoMXdzdV8rNP8+tDZ2N4YdhlZ4iEaaOtdN
-            3LZUiwPO2tMBGoWDPZA+0l4BtuMxwF6UZHrlpqLY4U+WqMeuh7DDiR0GU7cBqEND
-            MQrjdbOAwzN41jDBJwFQXAZjgbZ8DOI5w04vh36Ak0oQrh1zMa3BQer/vef/+8uJ
-            8Br0bwdT33hsjwqzJVOa
-            =Pnsh
+            hQGMA/JorPHm1g9XAQv/ahBdYHA9QgJKQCeHvni5MIEVXQk5EFnAZwTvbBBtbGvl
+            vsfl6NEn6HHotzssMYAoNSRn8iDP7OklmN5r8rYQ9kcSUGDbASR3y5ZC3sq8Wz+/
+            nemi2IdjEIhNXFkMSYtXo0hm5AZr3ptfYcw1didclYS1BQf78LSaTPBlcEbr7cAj
+            2vSWDUu1Z0QZFT21sJeQEDKHVrFGzlWprqgWLgQ8u9xsUwpn+DeOPSDryiERcj8G
+            idOx2hB/vVfLII2GbkoobnbG2Xb0fNnXgMD4IUO6X3G2oy59prTQTAdClBbSs6Ib
+            gBgTkN19WFcs64R1LgfcHnHt/HmrAAqhHdXCtAaFhYzgQyVvp4wmEs/A4fmsuucL
+            UCjHLhniejMZdWws+J1vjXnP3gWWNphrX2hw0mX4s7/tazHh3tBtaOBwQAK0koK4
+            qkzfCqrwIhpehFQ73h/yTdCx1LatLxUnQV+YUkVxPMEWecl5oyg2bfA1DkUey/gB
+            DGOQdw81rBSnxEACGNmY0l4Bi1giWAckvWIMDLnoQZn5gp/d9xhRq6r8HuMJD2Ad
+            cPaaf3o87OHiKfIwDbYmh7axcs/ET3fbzv3IxE4KLUuJaW26Hvmk898tkvUZ0wLK
+            uUkC1kQ9+8wTc8h8r0Gq
+            =5fVm
            -----END PGP MESSAGE-----
        fp: C8F8A49D04A1AB639F8EA21CDBA4B1DCB1FA5BDD
    encrypted_regex: ^(data|stringData)$