add blackbox monitoring

fix blackbox monitoring fix blackbox monitoring fix blackbox monitoring fix blackbox monitoring
2025-09-30 23:45:25 +02:00 · 2020-12-06 11:41:50 +01:00
parent 8a2b3246b0
commit b11f961232
15 changed files with 59 additions and 35 deletions
--- a/cluster/auth/authelia.yaml
+++ b/cluster/auth/authelia.yaml
@@ -84,6 +84,9 @@ kind: Service
 metadata:
  name: authelia
  namespace: auth
+  annotations:
+    prometheus.io/probe: "true"
+    prometheus.io/protocol: http
  labels:
    app.kubernetes.io/instance: authelia
    app.kubernetes.io/name: authelia
--- a/cluster/development/docker-registry.yaml
+++ b/cluster/development/docker-registry.yaml
@@ -30,6 +30,10 @@ spec:
        nginx.ingress.kubernetes.io/proxy-read-timeout: "6000"
        nginx.ingress.kubernetes.io/proxy-send-timeout: "6000"
        nginx.ingress.kubernetes.io/enable-global-auth: "false"
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
  valuesFrom:
  - kind: ConfigMap
    name: "helmrelease-development-docker-registry"
--- a/cluster/development/drone.yaml
+++ b/cluster/development/drone.yaml
@@ -19,23 +19,9 @@ spec:
    image:
      repository: drone/drone
      tag: 1.9.2
-    env:
-      DRONE_SERVER_PROTO: https
-      DRONE_GIT_ALWAYS_AUTH: true
-      DRONE_LOGS_TEXT: true
-      DRONE_LOGS_PRETTY: true
-      DRONE_LOGS_COLOR: true
    persistentVolume:
      enabled: true
      existingClaim: drone-config
-    ingress:
-      enabled: true
-      annotations:
-        kubernetes.io/ingress.class: "nginx"
-        nginx.ingress.kubernetes.io/enable-global-auth: "false"
-    podAnnotations:
-      prometheus.io/scrape: "true"
-      prometheus.io/port: "80"
  valuesFrom:
  - kind: ConfigMap
    name: "helmrelease-development-drone"
--- a/cluster/longhorn-system/longhorn.yaml
+++ b/cluster/longhorn-system/longhorn.yaml
@@ -36,10 +36,6 @@ spec:
      #mkfsExt4Parameters: 
    csi:
      kubeletRootDir: /var/lib/kubelet
-    ingress:
-      enabled: true
-      annotations:
-        kubernetes.io/ingress.class: "nginx"
      tls: true
  valuesFrom:
  - kind: ConfigMap
--- a/cluster/media/bazarr.yaml
+++ b/cluster/media/bazarr.yaml
@@ -38,6 +38,10 @@ spec:
    - name: nfs-video
      persistentVolumeClaim:
        claimName: nfs-video
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
    resources:
      requests:
        memory: 500Mi
--- a/cluster/media/jackett.yaml
+++ b/cluster/media/jackett.yaml
@@ -37,6 +37,10 @@ spec:
        cpu: 500m
      limits:
        memory: 1500Mi
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
  valuesFrom:
  - kind: ConfigMap
    name: helmrelease-media-jackett
--- a/cluster/media/jellyfin.yaml
+++ b/cluster/media/jellyfin.yaml
@@ -46,6 +46,10 @@ spec:
    - name: nfs-photo
      persistentVolumeClaim:
        claimName: nfs-photo
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
    resources:
      requests:
        memory: 4Gi
--- a/cluster/media/lidarr.yaml
+++ b/cluster/media/lidarr.yaml
@@ -49,6 +49,10 @@ spec:
        cpu: 500m
      limits:
        memory: 1500Mi
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
    affinity:
      nodeAffinity:
        requiredDuringSchedulingIgnoredDuringExecution:
--- a/cluster/media/pyload.yaml
+++ b/cluster/media/pyload.yaml
@@ -40,6 +40,10 @@ spec:
        cpu: 100m
      limits:
        memory: 5Gi
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
    affinity:
      nodeAffinity:
        requiredDuringSchedulingIgnoredDuringExecution:
--- a/cluster/media/qbittorrent.yaml
+++ b/cluster/media/qbittorrent.yaml
@@ -36,6 +36,10 @@ spec:
          protocol: TCP
          targetPort: 6881
        externalTrafficPolicy: Local
+      service:
+        annotations:
+          prometheus.io/probe: "true"
+          prometheus.io/protocol: tcp
    podSecurityContext:
      runAsUser: 568
      runAsGroup: 568
--- a/cluster/media/radarr.yaml
+++ b/cluster/media/radarr.yaml
@@ -49,6 +49,10 @@ spec:
        cpu: 500m
      limits:
        memory: 1500Mi
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
    affinity:
      nodeAffinity:
        requiredDuringSchedulingIgnoredDuringExecution:
--- a/cluster/media/sonarr.yaml
+++ b/cluster/media/sonarr.yaml
@@ -49,6 +49,10 @@ spec:
        cpu: 500m
      limits:
        memory: 1500Mi
+    service:
+      annotations:
+        prometheus.io/probe: "true"
+        prometheus.io/protocol: http
    affinity:
      nodeAffinity:
        requiredDuringSchedulingIgnoredDuringExecution:
--- a/cluster/monitoring/blackbox-exporter.yaml
+++ b/cluster/monitoring/blackbox-exporter.yaml
@@ -32,7 +32,7 @@ spec:
          prober: http
          timeout: 30s
          http:
-            valid_http_versions: ["HTTP/1.1","HTTP/2.0"]
+            valid_http_versions: ["HTTP/1.0", "HTTP/1.1", "HTTP/2.0"]
            no_follow_redirects: false
            preferred_ip_protocol: "ip4"
        tcp_connect:
--- a/cluster/monitoring/syslog-ng.yaml
+++ b/cluster/monitoring/syslog-ng.yaml
@@ -79,6 +79,9 @@ data:
 apiVersion: v1
 kind: Service
 metadata:
+  annotations:
+    prometheus.io/probe: "true"
+    prometheus.io/protocol: tcp
  labels:
    app.kubernetes.io/instance: syslog-ng
    app.kubernetes.io/name: syslog-ng
--- a/secrets/helmrelease-development-drone.yaml
+++ b/secrets/helmrelease-development-drone.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    values.yaml: ENC[AES256_GCM,data:33DZ6sIeseX5P9H+xkgTENS7Nuk9nVjO1+cHfZ/a8HahTxhdTrKXsUW3WFK1lBzX2JzZk8jRwmCSCAU6uYwdZ6P9UiC7njJLbnsTq5dgUc84J23H4z4lvCg9looUxdpzhHvAkBCECWaxuqborvRr21ipAxosoo/3wwwWbz7kcV2Q64nfSOOvxGGGtGlh3TsnGEb3yt5WiRkgeCD6aUhUrG7MYxYHwt/97Yid+H0KYqzgbSJ/a+b/N+EQJDJTeTp95LBnDqhgQ7R//clyRmuQBGZRuNsAYWBU52aP1F7O1ib0lylZ5osW0CH0kwOtwOSuALsAfDYkOB0TLYtNsPLPNzH0n1HceYrhJgHd9NtY8FQd8P//j5nUt28WcY6A/mTk2v/d+je+YUZs/JVrK9ofX6LalZaCWnS6iTMMJIzPXq9DE8yEs5F1hzQv3lMG9Z5GyzhFY4doK+/XE/tOiMOEduHiiY50H0+Xym8o1DWweZRfjmibshnAR5pOabR4+lk2PRZdVx5erApIFzWHgZuZJtDyDGgpMi3cVFEeQx/ds/QoL+uYmacocl5pJ1CPbDpBsWoCKEOmGQ3ZNbVTxfKEqVNbdWfXHosjdXp8ZZyaeLf6DCgMlXqA,iv:U+mdjUUmH2UkCJ+SdBDQ2RuQHHH/7c4MeY77f1GSVZY=,tag:afz7MqTYcK71+jBeggQp5w==,type:str]
+    values.yaml: ENC[AES256_GCM,data:dXVWlHUOaV493VSs6RwtsB3fy6mIdufGC4YVLeBs22ESgYRLgm3L8z8uJyRxIyCG73xFQN2fiixzMktYLqj5j7yVmSN0uBrbmE62xGOpMrhHKFjxgv6PON/mIb73+3M1/REYaOjUfKb2yH7wOl07uIWm5DhywoCJn8+vSp2Hk3XPyZDkRGN4YEWqo8pBxCPJe6U8pf5Mdm1vyDEvL2hoiAy2S7Bx9pN2rvMnMDLQsLIbbUxWbMJgZe4dd5/Ri/WC8f8n7VOZLAXQLFV+Ic33lZteQdgcK+WHFIawEPJGSiSjt+kcDprZOBqaTkjPvFJAQRZzve7HduVX5ZRijzLgLNgIQFxReeCtft7UpevVlo3skWwZ+zwjKVszbZyMq0Q5mUjUA5s9VsRPwbwlPqqBUIaAgdS52u36noAdlLMLnSGMpWs6zs1G2BB1R/cRKiT+aOsAZyafkV3LDeYHrF5FCAjlPJATeZMZPsHmY031M3NPWZIATT6pAiHRCVzuxKv+MzAS936xW6eRNRRfe43/K2mH/7x+mKzTgVoFrf8s4yFFEvMcsuNPZQgS9UgaERyxa2cVkBTNuKGaO0oY8QJ/fPuAntVvKhOVTQ7oieKgh5nTD3nrJrhwXI6UTUymJcV+aB4Xh0Bn8lLp42ZVMCCTvyVN2oUTlQQz90BOj6DhjxjERduu0ULUdLbfavk/n6UusHpSznJtJby8boDdUwEJdanLHqkUoCRFIgjT2fmMiX0xZYk+otJr54ZK5fXhBSHOwjRuHEU67AbmnM6OZzyZNtMjaoWIut/KQNl9rxzZ3L5lVOQqFlNd9AhSnNSVBbU4ykwZS4L1m1HaJ2vV+tCoTFQ4GitTclshoJm0C7uty6N58FOzV/vspQ05ZOLy86HSeAClq3XqDlyBfB+nbs/FaaR5NUknJvDR6Cfo3l+Oz3hM26gs1FKozcafMfL5wfb2GAroVXDm1qpVixOf7Sc3jzpEOg55waI5VvCSEh1Ahutub5GG6OSkWxNote7zN9XX,iv:uruBV57Pkp6OHDPWwl+C09T96JaB+M2UuzRzj1LSu3E=,tag:SXh2Wl95xXm1jIucOVnknQ==,type:str]
 kind: ConfigMap
 metadata:
    creationTimestamp: null
@@ -11,25 +11,25 @@ sops:
    gcp_kms: []
    azure_kv: []
    hc_vault: []
-    lastmodified: '2020-12-04T11:09:11Z'
-    mac: ENC[AES256_GCM,data:OvOzg7YtkUD4nZ3XaCiC/0ZyqmyaobpzBKMOrwOt2rcctBJNkJ8qs4mtwaRQ4Y73qkdK/nkTx7ZzfjgrqKEl2knBV5J0JTZ6aI9O25t1JcJ/zfZ4wo8iFbaRQhyVTTQ7JA8Rnsj4bP94wobx4XfUTIA3yppFA/eaOjFLcoMjbWc=,iv:v9lnKzk/e0ja337jmRtf+HDwrqDXMrSRYoYeYd8iHD8=,tag:xfCNV1alD24kCiEPn6SgZg==,type:str]
+    lastmodified: '2020-12-06T11:09:01Z'
+    mac: ENC[AES256_GCM,data:ks64pBO7GBQ4usUgo7O9HyoIxz4gKgTv1T3bfvATp2NDpy5yCumAVOSNqjaSz6xQ7JpZUnoNytvPW6OfSDZenn4w3hPLu1HvtNltSXdQKAOx2xBIDx6EtkYOtI6t6DH1KCqumN7cb6Is9XQIP6y0T4gWFg0FbgxKEjb0k11mx/Y=,iv:1pCLwVspxwPwgh4MeVgV916a/JlKEljfL33ln/YbzbA=,tag:/IX5cMzGY/Sm05FT5g8gKA==,type:str]
    pgp:
-    -   created_at: '2020-12-04T11:09:11Z'
+    -   created_at: '2020-12-06T11:09:00Z'
        enc: |
            -----BEGIN PGP MESSAGE-----

-            hQGMA/JorPHm1g9XAQwAjYD6Qurf0t8porCFLIagf0W3m9lXzvFJNMU1/gPb9ZEZ
-            QN3bVKTE0DwbLgkwrnCy6qua1Spy13K6qaHN0hEcM5GwHtfqJWzASUF9mD+7xLGW
-            vD9RFg7fvxsfaIMz6FQCaSFWSMVJ6WKWuoxvW9zKteeEp6HCYVK+iqPyBMnyvVxU
-            KmflYe1HpFx57SZgs4gPBGHgJjTx/ywaZA2b3hMXpoxKMuE5UkMC5LxcWy/e6Mfb
-            bePlqhQCUre1Vml+tMkI590i9g6qay8IrFq3WsAMs4CR2uJs6Ki5IJ/zYCS90b9o
-            mP+U1cLmGIFgjUdFST/sH9K6MiALxyk2BfslFW25j4qJhjtc11icf1dfis3R7yLl
-            mJ0xc36w+Kc6zaHysvkGkoZ1UTBv8IpvlbFRp8+LBjt5LQQQcm7A2sZD9wYrsM8n
-            WatDL4ckyb3Aep6j5ott2sTmt8+ejjfWhenU7NsbCfa6EcF8I59qgTb9W3wCx/1h
-            G7mpmA+Udspu+ZrNvGo/0l4BzmRC7zbK81C/UcgxQjRXtPhVshU3Ms+yxXLdZK3U
-            eG8Mp+6wdcyCgXwdd20bYCcupxedXwonKvgfiDDHfOhkxGgLBKTeAm6DlO+58TM1
-            qP6++cYKYoOuXOPj0dFt
-            =SeFj
+            hQGMA/JorPHm1g9XAQwAnb0eRLZy6H/BVhkD6ivrzrd4qfdd8jji1kZw0wh3WcnO
+            jpb2QmVwPRhU4sLq0Wm6Ao4llYwRxaEMf3Bllle3BMB3HzWVkgfQ7Fbb1ig8CET1
+            pCUuNN7U1MEYEi10Roy6Jne9coasFRqkiB007uGupAOxEaBW88WPxRQL5qK1QOMP
+            cUVD4JnUdx4gu60WzC+7fxBImAByo8jsYUYV6VREorKR8Un3EyY8T1a61c8P0fpU
+            XodyqQHtwg8hagxUHl/3TSG6HSSSjDPmR8WY+Z1UV6CVa+AQ2AVMoFf+Zf2Z/D6g
+            LVY4sZA4cxW6Uim0qgxqtYneBaufbJxiy2IqESW8zpCqw3ZNfFo9RUEQ6ZQrWsOr
+            fSwNVss1nbROGT9uJFXPuU3LDF/x+yx8DFi0/+FnDj1j2/FsjMgPBGCLM/Asun+O
+            pb4T4BYtqkECuulHNquFqaiBSnyQNhwr97UPSU/iWz3mEI5d+P8sQ6jD16UvdUBo
+            I3aLFqmbkFsWaRxpX4KY0l4BOoGYpl73gnqHRKW7NC5KEwKiXaKB8iw2V3ugFMPh
+            jq+TOg4k6V+O7D+W6Un6lkYtlP7gg8blm+S2Xm8Movn8h7WPbI4+uxRXyDaj6wrl
+            HAXT0UrFltD+3SXdmu7M
+            =TFB7
            -----END PGP MESSAGE-----
        fp: C8F8A49D04A1AB639F8EA21CDBA4B1DCB1FA5BDD
    encrypted_regex: ^(data|stringData)$