From 981135eaa75a5fc8eb2fdc050eee1d0f8436f052 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 21 Dec 2023 19:06:31 +0800 Subject: [PATCH] add observability-agent config for all clusters --- clusters/app/observability-agent.yaml | 4 +-- clusters/prod/helmrepo.yaml | 8 +++++ clusters/prod/kustomization.yaml | 7 +++++ clusters/prod/namespace.yaml | 4 +++ clusters/prod/observability-agent.yaml | 41 ++++++++++++++++++++++++++ clusters/sit/helmrepo.yaml | 8 +++++ clusters/sit/kustomization.yaml | 7 +++++ clusters/sit/namespace.yaml | 4 +++ clusters/sit/observability-agent.yaml | 41 ++++++++++++++++++++++++++ clusters/uat/helmrepo.yaml | 8 +++++ clusters/uat/kustomization.yaml | 7 +++++ clusters/uat/namespace.yaml | 4 +++ clusters/uat/observability-agent.yaml | 41 ++++++++++++++++++++++++++ 13 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 clusters/prod/helmrepo.yaml create mode 100644 clusters/prod/kustomization.yaml create mode 100644 clusters/prod/namespace.yaml create mode 100644 clusters/prod/observability-agent.yaml create mode 100644 clusters/sit/helmrepo.yaml create mode 100644 clusters/sit/kustomization.yaml create mode 100644 clusters/sit/namespace.yaml create mode 100644 clusters/sit/observability-agent.yaml create mode 100644 clusters/uat/helmrepo.yaml create mode 100644 clusters/uat/kustomization.yaml create mode 100644 clusters/uat/namespace.yaml create mode 100644 clusters/uat/observability-agent.yaml diff --git a/clusters/app/observability-agent.yaml b/clusters/app/observability-agent.yaml index 5d046ed..2544db0 100644 --- a/clusters/app/observability-agent.yaml +++ b/clusters/app/observability-agent.yaml @@ -29,7 +29,7 @@ spec: - web.enable-lifecycle remoteWrite: - name: remote_prometheus - url: 'https://prometheus.svc.plus/api/v1/write' + url: 'https://prometheus.svc.ink/api/v1/write' alertmanager: enabled: false prometheus-pushgateway: @@ -38,4 +38,4 @@ spec: enabled: true config: clients: - - url: https://data-gateway.svc.plus/loki/api/v1/push + - url: https://data-gateway.svc.ink/loki/api/v1/push diff --git a/clusters/prod/helmrepo.yaml b/clusters/prod/helmrepo.yaml new file mode 100644 index 0000000..1b83e6e --- /dev/null +++ b/clusters/prod/helmrepo.yaml @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..433cd6d --- /dev/null +++ b/clusters/prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: monitoring +resources: + - namespace.yaml + - helmrepo.yaml + - observability-agent.yaml diff --git a/clusters/prod/namespace.yaml b/clusters/prod/namespace.yaml new file mode 100644 index 0000000..d325236 --- /dev/null +++ b/clusters/prod/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: monitoring diff --git a/clusters/prod/observability-agent.yaml b/clusters/prod/observability-agent.yaml new file mode 100644 index 0000000..2544db0 --- /dev/null +++ b/clusters/prod/observability-agent.yaml @@ -0,0 +1,41 @@ +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/sit/helmrepo.yaml b/clusters/sit/helmrepo.yaml new file mode 100644 index 0000000..1b83e6e --- /dev/null +++ b/clusters/sit/helmrepo.yaml @@ -0,0 +1,8 @@ +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/sit/kustomization.yaml b/clusters/sit/kustomization.yaml new file mode 100644 index 0000000..433cd6d --- /dev/null +++ b/clusters/sit/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: monitoring +resources: + - namespace.yaml + - helmrepo.yaml + - observability-agent.yaml diff --git a/clusters/sit/namespace.yaml b/clusters/sit/namespace.yaml new file mode 100644 index 0000000..d325236 --- /dev/null +++ b/clusters/sit/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: monitoring diff --git a/clusters/sit/observability-agent.yaml b/clusters/sit/observability-agent.yaml new file mode 100644 index 0000000..2544db0 --- /dev/null +++ b/clusters/sit/observability-agent.yaml @@ -0,0 +1,41 @@ +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/helmrepo.yaml b/clusters/uat/helmrepo.yaml new file mode 100644 index 0000000..1b83e6e --- /dev/null +++ b/clusters/uat/helmrepo.yaml @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..433cd6d --- /dev/null +++ b/clusters/uat/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: monitoring +resources: + - namespace.yaml + - helmrepo.yaml + - observability-agent.yaml diff --git a/clusters/uat/namespace.yaml b/clusters/uat/namespace.yaml new file mode 100644 index 0000000..d325236 --- /dev/null +++ b/clusters/uat/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: monitoring diff --git a/clusters/uat/observability-agent.yaml b/clusters/uat/observability-agent.yaml new file mode 100644 index 0000000..2544db0 --- /dev/null +++ b/clusters/uat/observability-agent.yaml @@ -0,0 +1,41 @@ +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