From 2f4660e0b928511a96f16a44f63be47331c2e4ee Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 22 Dec 2023 01:25:33 +0800 Subject: [PATCH] set clusters/uat,prod --- clusters/app/observability-agent.yaml | 41 --------------------- clusters/prod/helmrepo.yaml | 8 ----- clusters/prod/kustomization.yaml | 6 ++-- clusters/prod/namespace.yaml | 2 ++ clusters/prod/observability-agent.yaml | 41 --------------------- clusters/prod/podmonitor.yaml | 30 ++++++++++++++++ clusters/sit/observability-agent.yaml | 50 -------------------------- clusters/uat/helmrepo.yaml | 8 ----- clusters/uat/kustomization.yaml | 6 ++-- clusters/uat/namespace.yaml | 2 ++ clusters/uat/observability-agent.yaml | 41 --------------------- clusters/uat/podmonitor.yaml | 30 ++++++++++++++++ 12 files changed, 70 insertions(+), 195 deletions(-) delete mode 100644 clusters/app/observability-agent.yaml delete mode 100644 clusters/prod/helmrepo.yaml delete mode 100644 clusters/prod/observability-agent.yaml create mode 100644 clusters/prod/podmonitor.yaml delete mode 100644 clusters/sit/observability-agent.yaml delete mode 100644 clusters/uat/helmrepo.yaml delete mode 100644 clusters/uat/observability-agent.yaml create mode 100644 clusters/uat/podmonitor.yaml diff --git a/clusters/app/observability-agent.yaml b/clusters/app/observability-agent.yaml deleted file mode 100644 index 2544db0..0000000 --- a/clusters/app/observability-agent.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: observabilityagent - namespace: monitoring -spec: - chart: - spec: - chart: observabilityagent - version: "0.1.6" - sourceRef: - kind: HelmRepository - name: stable - namespace: monitoring - interval: 1m - values: - fluent-bit: - enabled: false - deepflow-agent: - enabled: true - deepflowServerNodeIPS: - - 10.0.1.3 - deepflowK8sClusterID: d-rUJ4CUKMUt - prometheus: - enabled: true - server: - extraFlags: - - enable-feature=expand-external-labels - - web.enable-lifecycle - remoteWrite: - - name: remote_prometheus - url: 'https://prometheus.svc.ink/api/v1/write' - alertmanager: - enabled: false - prometheus-pushgateway: - enabled: false - promtail: - enabled: true - config: - clients: - - url: https://data-gateway.svc.ink/loki/api/v1/push diff --git a/clusters/prod/helmrepo.yaml b/clusters/prod/helmrepo.yaml deleted file mode 100644 index 1b83e6e..0000000 --- a/clusters/prod/helmrepo.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: stable - namespace: monitoring -spec: - interval: 1m - url: https://charts.onwalk.net/ diff --git a/clusters/prod/kustomization.yaml b/clusters/prod/kustomization.yaml index 433cd6d..f345818 100644 --- a/clusters/prod/kustomization.yaml +++ b/clusters/prod/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: monitoring resources: - namespace.yaml - - helmrepo.yaml - - observability-agent.yaml + - ../../apps/monitor/observability-agent/ + - ../../apps/monitor/kube-prometheus-stack/ + - podmonitor.yaml diff --git a/clusters/prod/namespace.yaml b/clusters/prod/namespace.yaml index d325236..78abcfc 100644 --- a/clusters/prod/namespace.yaml +++ b/clusters/prod/namespace.yaml @@ -2,3 +2,5 @@ apiVersion: v1 kind: Namespace metadata: name: monitoring + labels: + app.kubernetes.io/component: monitoring diff --git a/clusters/prod/observability-agent.yaml b/clusters/prod/observability-agent.yaml deleted file mode 100644 index 2544db0..0000000 --- a/clusters/prod/observability-agent.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: observabilityagent - namespace: monitoring -spec: - chart: - spec: - chart: observabilityagent - version: "0.1.6" - sourceRef: - kind: HelmRepository - name: stable - namespace: monitoring - interval: 1m - values: - fluent-bit: - enabled: false - deepflow-agent: - enabled: true - deepflowServerNodeIPS: - - 10.0.1.3 - deepflowK8sClusterID: d-rUJ4CUKMUt - prometheus: - enabled: true - server: - extraFlags: - - enable-feature=expand-external-labels - - web.enable-lifecycle - remoteWrite: - - name: remote_prometheus - url: 'https://prometheus.svc.ink/api/v1/write' - alertmanager: - enabled: false - prometheus-pushgateway: - enabled: false - promtail: - enabled: true - config: - clients: - - url: https://data-gateway.svc.ink/loki/api/v1/push diff --git a/clusters/prod/podmonitor.yaml b/clusters/prod/podmonitor.yaml new file mode 100644 index 0000000..9e5f8d3 --- /dev/null +++ b/clusters/prod/podmonitor.yaml @@ -0,0 +1,30 @@ +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 diff --git a/clusters/sit/observability-agent.yaml b/clusters/sit/observability-agent.yaml deleted file mode 100644 index 41b3362..0000000 --- a/clusters/sit/observability-agent.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: stable - namespace: monitoring -spec: - interval: 1m - url: https://charts.onwalk.net/ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: observabilityagent - namespace: monitoring -spec: - chart: - spec: - chart: observabilityagent - version: "0.1.6" - sourceRef: - kind: HelmRepository - name: stable - namespace: monitoring - interval: 1m - values: - fluent-bit: - enabled: false - deepflow-agent: - enabled: true - deepflowServerNodeIPS: - - 10.0.1.3 - deepflowK8sClusterID: d-rUJ4CUKMUt - prometheus: - enabled: false - server: - extraFlags: - - enable-feature=expand-external-labels - - web.enable-lifecycle - remoteWrite: - - name: remote_prometheus - url: 'https://prometheus.svc.ink/api/v1/write' - alertmanager: - enabled: false - prometheus-pushgateway: - enabled: false - promtail: - enabled: true - config: - clients: - - url: https://data-gateway.svc.ink/loki/api/v1/push diff --git a/clusters/uat/helmrepo.yaml b/clusters/uat/helmrepo.yaml deleted file mode 100644 index 1b83e6e..0000000 --- a/clusters/uat/helmrepo.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: stable - namespace: monitoring -spec: - interval: 1m - url: https://charts.onwalk.net/ diff --git a/clusters/uat/kustomization.yaml b/clusters/uat/kustomization.yaml index 433cd6d..f345818 100644 --- a/clusters/uat/kustomization.yaml +++ b/clusters/uat/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: monitoring resources: - namespace.yaml - - helmrepo.yaml - - observability-agent.yaml + - ../../apps/monitor/observability-agent/ + - ../../apps/monitor/kube-prometheus-stack/ + - podmonitor.yaml diff --git a/clusters/uat/namespace.yaml b/clusters/uat/namespace.yaml index d325236..78abcfc 100644 --- a/clusters/uat/namespace.yaml +++ b/clusters/uat/namespace.yaml @@ -2,3 +2,5 @@ apiVersion: v1 kind: Namespace metadata: name: monitoring + labels: + app.kubernetes.io/component: monitoring diff --git a/clusters/uat/observability-agent.yaml b/clusters/uat/observability-agent.yaml deleted file mode 100644 index 2544db0..0000000 --- a/clusters/uat/observability-agent.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: observabilityagent - namespace: monitoring -spec: - chart: - spec: - chart: observabilityagent - version: "0.1.6" - sourceRef: - kind: HelmRepository - name: stable - namespace: monitoring - interval: 1m - values: - fluent-bit: - enabled: false - deepflow-agent: - enabled: true - deepflowServerNodeIPS: - - 10.0.1.3 - deepflowK8sClusterID: d-rUJ4CUKMUt - prometheus: - enabled: true - server: - extraFlags: - - enable-feature=expand-external-labels - - web.enable-lifecycle - remoteWrite: - - name: remote_prometheus - url: 'https://prometheus.svc.ink/api/v1/write' - alertmanager: - enabled: false - prometheus-pushgateway: - enabled: false - promtail: - enabled: true - config: - clients: - - url: https://data-gateway.svc.ink/loki/api/v1/push diff --git a/clusters/uat/podmonitor.yaml b/clusters/uat/podmonitor.yaml new file mode 100644 index 0000000..9e5f8d3 --- /dev/null +++ b/clusters/uat/podmonitor.yaml @@ -0,0 +1,30 @@ +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