merged: podmonitor.yaml -> apps/monitor/kube-prometheus-stack/podmonitor-*.yaml

2023-12-28 13:52:58 +08:00 · 2023-12-28 13:52:58 +08:00 · 4b52a009a1
commit 4b52a009a1
parent 7c745aeaa6
10 changed files with 9 additions and 105 deletions
--- a/apps/monitor/kube-prometheus-stack/kustomization.yaml
+++ b/apps/monitor/kube-prometheus-stack/kustomization.yaml
@ -4,6 +4,8 @@ namespace: monitoring
 resources:
  - repository.yaml
  - release.yaml
+  - podmonitor-gitops-system.yaml
+  - podmonitor-ingress.yaml
 configMapGenerator:
  - name: flux-kube-state-metrics-config
    files:
--- a/apps/monitor/kube-prometheus-stack/podmonitor-gitops-system.yaml
+++ b/apps/monitor/kube-prometheus-stack/podmonitor-gitops-system.yaml
--- a/apps/monitor/kube-prometheus-stack/podmonitor-ingress.yaml
+++ b/apps/monitor/kube-prometheus-stack/podmonitor-ingress.yaml
@ -1,27 +1,23 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: flux-system
+  name: nginx
+  namespace: ingress
  labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/part-of: nginx
+    app.kubernetes.io/component: ingress
 spec:
  namespaceSelector:
    matchNames:
-      - flux-system
+      - ingress
  selector:
    matchExpressions:
      - key: app
        operator: In
        values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
+          - nginx
  podMetricsEndpoints:
-    - port: http-prom
+    - port: "9113"
      relabelings:
        # https://github.com/prometheus-operator/prometheus-operator/issues/4816
        - sourceLabels: [__meta_kubernetes_pod_phase]
--- a/clusters/devops/kustomization.yaml
+++ b/clusters/devops/kustomization.yaml
@ -5,7 +5,6 @@ resources:
  - ../../apps/monitor/observability-agent/
  - ../../apps/monitor/kube-prometheus-stack/
  - ../../apps/monitor/flagger/
-  - podmonitor.yaml
  - ../../apps/c-demo/
  - ../../apps/js-demo/
  - ../../apps/python-demo/
--- a/clusters/prod/kustomization.yaml
+++ b/clusters/prod/kustomization.yaml
@ -5,7 +5,6 @@ resources:
  - ../../apps/monitor/observability-agent/
  - ../../apps/monitor/kube-prometheus-stack/
  - ../../apps/monitor/flagger/
-  - podmonitor.yaml
  - ../../apps/c-demo/
  - ../../apps/js-demo/
  - ../../apps/python-demo/
--- a/clusters/prod/podmonitor.yaml
+++ b/clusters/prod/podmonitor.yaml
@ -1,30 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: gitops-system
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
-spec:
-  namespaceSelector:
-    matchNames:
-      - gitops-system
-  selector:
-    matchExpressions:
-      - key: app
-        operator: In
-        values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
-  podMetricsEndpoints:
-    - port: "8080"
-      relabelings:
-        # https://github.com/prometheus-operator/prometheus-operator/issues/4816
-        - sourceLabels: [__meta_kubernetes_pod_phase]
-          action: keep
-          regex: Running
--- a/clusters/sit/kustomization.yaml
+++ b/clusters/sit/kustomization.yaml
@ -5,7 +5,6 @@ resources:
  - ../../apps/monitor/observability-agent/
  - ../../apps/monitor/kube-prometheus-stack/
  - ../../apps/monitor/flagger/
-  - podmonitor.yaml
  - ../../apps/c-demo/
  - ../../apps/js-demo/
  - ../../apps/python-demo/
--- a/clusters/sit/podmonitor.yaml
+++ b/clusters/sit/podmonitor.yaml
@ -1,30 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: gitops-system
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
-spec:
-  namespaceSelector:
-    matchNames:
-      - gitops-system
-  selector:
-    matchExpressions:
-      - key: app
-        operator: In
-        values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
-  podMetricsEndpoints:
-    - port: "8080"
-      relabelings:
-        # https://github.com/prometheus-operator/prometheus-operator/issues/4816
-        - sourceLabels: [__meta_kubernetes_pod_phase]
-          action: keep
-          regex: Running
--- a/clusters/uat/kustomization.yaml
+++ b/clusters/uat/kustomization.yaml
@ -5,7 +5,6 @@ resources:
  - ../../apps/monitor/observability-agent/
  - ../../apps/monitor/kube-prometheus-stack/
  - ../../apps/monitor/flagger/
-  - podmonitor.yaml
  - ../../apps/c-demo/
  - ../../apps/js-demo/
  - ../../apps/python-demo/
--- a/clusters/uat/podmonitor.yaml
+++ b/clusters/uat/podmonitor.yaml
@ -1,30 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: gitops-system
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
-spec:
-  namespaceSelector:
-    matchNames:
-      - gitops-system
-  selector:
-    matchExpressions:
-      - key: app
-        operator: In
-        values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
-  podMetricsEndpoints:
-    - port: "8080"
-      relabelings:
-        # https://github.com/prometheus-operator/prometheus-operator/issues/4816
-        - sourceLabels: [__meta_kubernetes_pod_phase]
-          action: keep
-          regex: Running