diff --git a/clusters/sit/helmrepo.yaml b/clusters/sit/helmrepo.yaml deleted file mode 100644 index 1b83e6e..0000000 --- a/clusters/sit/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/sit/kustomization.yaml b/clusters/sit/kustomization.yaml index 433cd6d..6501db5 100644 --- a/clusters/sit/kustomization.yaml +++ b/clusters/sit/kustomization.yaml @@ -2,6 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: monitoring resources: - - namespace.yaml - - helmrepo.yaml - observability-agent.yaml + - prometheus-operator-agent.yaml diff --git a/clusters/sit/namespace.yaml b/clusters/sit/namespace.yaml deleted file mode 100644 index d325236..0000000 --- a/clusters/sit/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: monitoring diff --git a/clusters/sit/observability-agent.yaml b/clusters/sit/observability-agent.yaml index 2544db0..78521c3 100644 --- a/clusters/sit/observability-agent.yaml +++ b/clusters/sit/observability-agent.yaml @@ -1,3 +1,17 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: monitoring +--- +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: @@ -22,7 +36,7 @@ spec: - 10.0.1.3 deepflowK8sClusterID: d-rUJ4CUKMUt prometheus: - enabled: true + enabled: false server: extraFlags: - enable-feature=expand-external-labels diff --git a/clusters/sit/prometheus-operator-agent.yaml b/clusters/sit/prometheus-operator-agent.yaml new file mode 100644 index 0000000..c990316 --- /dev/null +++ b/clusters/sit/prometheus-operator-agent.yaml @@ -0,0 +1,45 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: monitoring +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: prometheus-community + namespace: monitoring +spec: + interval: 1m + url: https://prometheus-community.github.io/helm-charts +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: observabilityagent + namespace: monitoring +spec: + chart: + spec: + chart: kube-prometheus-stack + version: "55.5.0" + sourceRef: + kind: HelmRepository + name: prometheus-community + namespace: monitoring + interval: 1m + values: + prometheusOperator: + enabled: true + crds: + enabled: true + prometheus: + enabled: true + agentMode: true + prometheusSpec: + remoteWrite: + - name: remote_prometheus + url: 'https://prometheus.svc.ink/api/v1/write' + grafana: + enabled: false + prometheus-windows-exporter: + enabled: false