[monitoring] updated kube-prometheus-stack to 56.6.2

gruberdev · Feb 12, 2024 · f72530f · f72530f
1 parent 48adde6
commit f72530f
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 86 deletions.
diff --git a/apps/monitoring/kube-prometheus/base/endpoints.yaml b/apps/monitoring/kube-prometheus/base/endpoints.yaml
@@ -4,13 +4,10 @@ metadata:
   name: k3s-metrics-service
   namespace: kube-system
 subsets:
-- addresses:
-  - ip: 10.0.0.11
-  - ip: 10.0.0.12
-  - ip: 10.0.0.13
-  - ip: 10.0.0.14
-  - ip: 10.0.0.15
-  ports:
-  - name: https-metrics
-    port: 10250
-    protocol: TCP
+  - addresses:
+      - ip: 192.168.1.2
+      - ip: 192.168.1.10
+    ports:
+      - name: https-metrics
+        port: 10250
+        protocol: TCP
diff --git a/apps/monitoring/kube-prometheus/core.yaml b/apps/monitoring/kube-prometheus/core.yaml
@@ -6,7 +6,7 @@ spec:
   project: monitoring
   source:
     repoURL: "https://github.com/prometheus-community/helm-charts.git"
-    targetRevision: kube-prometheus-stack-55.5.1
+    targetRevision: kube-prometheus-stack-56.6.2
     path: charts/kube-prometheus-stack
     helm:
       releaseName: kube-prometheus
@@ -17,7 +17,7 @@ spec:
           create: true
           rules:
             alertmanager: true
-            etcd: true
+            etcd: false
             configReloaders: true
             general: true
             k8sContainerCpuUsageSecondsTotal: true
@@ -61,41 +61,17 @@ spec:
           enabled: false
         kubeScheduler:
           enabled: true
-          endpoints:
-            - 192.168.1.2
-            - 192.168.1.10
-          service:
-            enabled: true
-            port: 10259
-            targetPort: 10259
-          serviceMonitor:
-            enabled: true
-            https: true
-            insecureSkipVerify: true
+          endpoints: *cp
         kubeControllerManager:
           enabled: true
-          endpoints:
+          endpoints: &cp
             - 192.168.1.2
             - 192.168.1.10
-          service:
-            enabled: true
-            port: 10257
-            targetPort: 10257
-          serviceMonitor:
-            enabled: true
-            https: true
-            insecureSkipVerify: true
         kubeEtcd:
           enabled: true
-          endpoints:
-            - 192.168.1.2
-            - 192.168.1.10
-          service:
-            enabled: true
-            port: 2381
-            targetPort: 2381
-          serviceMonitor:
-            enabled: true
+          endpoints: *cp
+        kubeProxy:
+          enabled: false
         prometheus-windows-exporter:
           prometheus:
             monitor:
@@ -374,17 +350,43 @@ spec:
               uid: prometheus
         kubernetesServiceMonitors:
           enabled: true
-        kubeApiServer:
-          enabled: false
-        nodeExporter:
-          enabled: false
         kubelet:
           enabled: true
-          namespace: kube-system
           serviceMonitor:
-            cAdvisor: true
-            https: true
-            probes: true
+            metricRelabelings:
+              # Drop high cardinality labels
+              - action: labeldrop
+                regex: (uid)
+              - action: labeldrop
+                regex: (id|name)
+              - action: drop
+                sourceLabels: ["__name__"]
+                regex: (rest_client_request_duration_seconds_bucket|rest_client_request_duration_seconds_sum|rest_client_request_duration_seconds_count)
+        kubeApiServer:
+          enabled: true
+          serviceMonitor:
+            metricRelabelings:
+              # Drop high cardinality labels
+              - action: drop
+                sourceLabels: ["__name__"]
+                regex: (apiserver|etcd|rest_client)_request(|_sli|_slo)_duration_seconds_bucket
+              - action: drop
+                sourceLabels: ["__name__"]
+                regex: (apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket)
+        nodeExporter:
+          enabled: true
+        prometheus-node-exporter:
+          fullnameOverride: node-exporter
+          prometheus:
+            monitor:
+              enabled: true
+              relabelings:
+                - action: replace
+                  regex: (.*)
+                  replacement: $1
+                  sourceLabels:
+                    - __meta_kubernetes_pod_node_name
+                  targetLabel: kubernetes_node
         coreDns:
           enabled: true
           service:
@@ -393,6 +395,7 @@ spec:
         kubeStateMetrics:
           enabled: true
         kube-state-metrics:
+          fullnameOverride: kube-state-metrics
           metricLabelsAllowlist:
             - 'pods=[*]'
             - 'deployments=[*]'
@@ -401,18 +404,18 @@ spec:
           prometheus:
             monitor:
               enabled: true
+              relabelings:
+                - action: replace
+                  regex: (.*)
+                  replacement: $1
+                  sourceLabels:
+                    - __meta_kubernetes_pod_node_name
+                  targetLabel: kubernetes_node
           rbac:
             create: true
           releaseLabel: true
           selfMonitor:
             enabled: true
-        nodeExporter:
-          enabled: false
-          operatingSystems:
-            linux:
-              enabled: true
-            darwin:
-              enabled: true
         prometheus-node-exporter:
           fullnameOverride: node-exporter
           extraArgs:
@@ -451,22 +454,13 @@ spec:
             readOnlyRootFilesystem: true
           enabled: true
           hostNetwork: false
-          image:
-            pullPolicy: IfNotPresent
-            registry: quay.io
-            repository: prometheus-operator/prometheus-operator
-            tag: v0.70.0
           kubeletService:
             enabled: false
           networkPolicy:
             enabled: false
           nodeSelector:
             kubernetes.io/arch: amd64
           prometheusConfigReloader:
-            image:
-              registry: quay.io
-              repository: prometheus-operator/prometheus-config-reloader
-              tag: v0.70.0
             resources:
               limits:
                 cpu: 80m
@@ -509,6 +503,12 @@ spec:
             enabled: false
             minAvailable: 1
           prometheusSpec:
+            replicaExternalLabelName: __replica__
+            ruleSelectorNilUsesHelmValues: false
+            serviceMonitorSelectorNilUsesHelmValues: false
+            podMonitorSelectorNilUsesHelmValues: false
+            probeSelectorNilUsesHelmValues: false
+            scrapeConfigSelectorNilUsesHelmValues: false
             allowOverlappingBlocks: false
             arbitraryFSAccessThroughSMs: false
             disableCompaction: false
@@ -521,10 +521,6 @@ spec:
             enforcedTargetLimit: false
             hostNetwork: false
             ignoreNamespaceSelectors: false
-            image:
-              registry: quay.io
-              repository: prometheus/prometheus
-              tag: v2.48.1
             listenLocal: false
             logFormat: logfmt
             logLevel: info
@@ -535,17 +531,13 @@ spec:
             overrideHonorTimestamps: false
             paused: false
             podAntiAffinityTopologyKey: kubernetes.io/hostname
-            podMonitorSelectorNilUsesHelmValues: false
             portName: http-web
-            probeSelectorNilUsesHelmValues: false
             prometheusExternalLabelNameClear: false
             queryLogFile: false
             remoteWriteDashboards: false
-            replicaExternalLabelNameClear: false
             replicas: 1
             retention: 10d
             routePrefix: /
-            ruleSelectorNilUsesHelmValues: false
             securityContext:
               fsGroup: 2000
               runAsGroup: 2000
@@ -554,7 +546,6 @@ spec:
             serviceMonitorNamespaceSelector:
               matchLabels:
                 prometheus: enabled
-            serviceMonitorSelectorNilUsesHelmValues: false
             shards: 1
             storageSpec:
               volumeClaimTemplate:
@@ -564,7 +555,7 @@ spec:
                   resources:
                     requests:
                       storage: 100Gi
-                  storageClassName: iscsi
+                  storageClassName: mayastor-single-replica
             walCompression: true
           service:
             externalTrafficPolicy: Cluster
@@ -636,7 +627,7 @@ spec:
               seccompProfile:
                 type: RuntimeDefault
             portName: web
-        cleanPrometheusOperatorObjectNames: false
+        cleanPrometheusOperatorObjectNames: true
   destination:
     namespace: monitoring
     name: in-cluster

diff --git a/apps/monitoring/kube-prometheus/crds/kustomization.yaml b/apps/monitoring/kube-prometheus/crds/kustomization.yaml
@@ -2,16 +2,16 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml
-  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-55.5.1/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml
+  - https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-56.6.2/charts/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml
 
 commonAnnotations:
   argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true,ServerSideApply=true,Replace=true,Validate=false