feat(monitor): 完善监控配置

apps/devops/cert-manager/helmchart.yaml

@@ -24,6 +24,12 @@ spec:
       - key: "node-role.kubernetes.io/master"
         operator: "Exists"
         effect: "NoSchedule"
+    prometheus:
+      enabled: true
+      servicemonitor:
+        enabled: true
+        interval: 600s
+        prometheusInstance: kube-prometheus
     webhook:
       affinity:
         nodeAffinity:

apps/monitor/crowdsec/helmchart.yaml

@@ -11,7 +11,17 @@ spec:
   valuesContent: |-
     container_runtime: containerd
     image:
-      tag: v1.6.1-2
+      tag: v1.6.2
+    config:
+      config.yaml.local: |
+        db_config:
+          type: postgresql
+          host: cnpg-cluster-hk-rw.infra-data
+          port: 5432
+          db_name: crowdsec
+          user: app
+          password: iUYXiu1ZfQdnKTAS3tj8c6dD7OHKlFPrwmzEXNpvcS6nLswV6JPg6YoK1gqZk1sO
+          sslmode: require
     agent:
       affinity:
         nodeAffinity:
@@ -41,3 +51,10 @@ spec:
                     values:
                       - alihka
               weight: 1
+      resources:
+        limits:
+          memory: 200Mi
+        requests:
+          cpu: 150m
+          memory: 100Mi
+

apps/monitor/prometheus/helmchart.yaml

@@ -61,7 +61,6 @@ spec:
       prometheusSpec:
         nodeSelector:
           kubernetes.io/hostname: alihka
-        routePrefix: /prometheus
         storageSpec:
           volumeClaimTemplate:
             spec:
@@ -71,8 +70,12 @@ spec:
               resources:
                 requests:
                   storage: 30Gi
+        routePrefix: /prometheus
+        serviceMonitorSelectorNilUsesHelmValues: false
+        podMonitorSelectorNilUsesHelmValues: false
+        ruleSelectorNilUsesHelmValues: false
       ingress:
-        enabled: false
+        enabled: true
         ingressClassName: nginx
         hosts:
           - monitor.dev.cm
@@ -94,7 +97,7 @@ spec:
                   storage: 10Gi
         routePrefix: /alertmanager
       ingress:
-        enabled: false
+        enabled: true
         ingressClassName: nginx
         hosts:
           - monitor.dev.cm

apps/net/nginx/helmchart.yaml

@@ -64,7 +64,7 @@ spec:
             - name: API_URL
               value: "http://crowdsec-service.infra-monitor.svc.cluster.local:8080"
             - name: API_KEY
-              value: "lkFoJuR7ZPFeaN97wM04EVTUH+icqiSEgXPBXteaMsE"
+              value: "NQLDIAxiToOs3PmChTq5Vl+ByY3GAffyhEFqIXDpvU4"
             - name: BOUNCER_CONFIG
               value: "/crowdsec/crowdsec-bouncer.conf"
           command: ['sh', '-c', "bash /docker_start.sh; mkdir -p /lua_plugins/crowdsec/; cp -R /crowdsec/* /lua_plugins/crowdsec/"]