From cc1de3d920bd5ad74f9adc01e6b31305beba5ceb Mon Sep 17 00:00:00 2001 From: Manuel Ganter Date: Fri, 24 Oct 2025 14:07:35 +0200 Subject: [PATCH] removed scrape from vm-client-stack --- .../vm-client-stack/values.yaml | 44 +++++++------------ .../vm-client-stack/values.yaml | 44 +++++++------------ 2 files changed, 32 insertions(+), 56 deletions(-) diff --git a/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml b/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml index 255e9e5..8183b9f 100644 --- a/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml +++ b/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml @@ -296,8 +296,7 @@ vmsingle: # -- Enable deployment of ingress for server component enabled: false # -- Ingress annotations - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" # -- Ingress extra labels @@ -347,8 +346,7 @@ vmcluster: resources: requests: storage: 10Gi - resources: - {} + resources: {} # limits: # cpu: "1" # memory: 1500Mi @@ -365,8 +363,7 @@ vmcluster: resources: requests: storage: 2Gi - resources: - {} + resources: {} # limits: # cpu: "1" # memory: "1000Mi" @@ -379,8 +376,7 @@ vmcluster: port: "8480" replicaCount: 2 extraArgs: {} - resources: - {} + resources: {} # limits: # cpu: "1" # memory: 1000Mi @@ -473,8 +469,7 @@ vmcluster: enabled: false # -- Ingress annotations - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -640,8 +635,7 @@ alertmanager: enabled: true # -- (object) Extra alert templates - templateFiles: - {} + templateFiles: {} # template_1.tmpl: |- # {{ define "hello" -}} # hello, Victoria! @@ -655,8 +649,7 @@ alertmanager: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -699,8 +692,7 @@ vmalert: externalLabels: {} # -- (object) Extra VMAlert annotation templates - templateFiles: - {} + templateFiles: {} # template_1.tmpl: |- # {{ define "hello" -}} # hello, Victoria! @@ -723,8 +715,7 @@ vmalert: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -791,7 +782,7 @@ vmagent: port: "8429" selectAllByDefault: true scrapeInterval: 20s - externalLabels: + externalLabels: cluster_environment: "edp" # For multi-cluster setups it is useful to use "cluster" label to identify the metrics source. # For example: @@ -808,8 +799,7 @@ vmagent: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -868,7 +858,7 @@ defaultDatasources: implementation: prometheus # -- Configure additional grafana datasources (passed through tpl). # Check [here](http://docs.grafana.org/administration/provisioning/#datasources) for details - extra: + extra: - name: victoria-logs access: proxy type: VictoriaLogs @@ -912,8 +902,7 @@ grafana: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -947,7 +936,7 @@ grafana: matchLabels: app.kubernetes.io/name: '{{ include "grafana.name" .Subcharts.grafana }}' endpoints: - - port: '{{ .Values.grafana.service.portName }}' + - port: "{{ .Values.grafana.service.portName }}" # -- prometheus-node-exporter dependency chart configuration. For possible values check [here](https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-node-exporter/values.yaml) prometheus-node-exporter: @@ -1078,7 +1067,7 @@ kubeApiServer: # Component scraping the kube controller manager kubeControllerManager: # -- Enable kube controller manager metrics scraping - enabled: true + enabled: false # -- If your kube controller manager is not deployed as a pod, specify IPs it can be found on endpoints: [] @@ -1211,7 +1200,7 @@ kubeEtcd: # Component scraping kube scheduler kubeScheduler: # -- Enable KubeScheduler metrics scraping - enabled: true + enabled: false # -- If your kube scheduler is not deployed as a pod, specify IPs it can be found on endpoints: [] @@ -1285,4 +1274,3 @@ kubeProxy: # -- Add extra objects dynamically to this chart extraObjects: [] - diff --git a/otc/observability.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml b/otc/observability.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml index eba6aeb..3a3efb0 100644 --- a/otc/observability.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml +++ b/otc/observability.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml @@ -296,8 +296,7 @@ vmsingle: # -- Enable deployment of ingress for server component enabled: false # -- Ingress annotations - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" # -- Ingress extra labels @@ -347,8 +346,7 @@ vmcluster: resources: requests: storage: 10Gi - resources: - {} + resources: {} # limits: # cpu: "1" # memory: 1500Mi @@ -365,8 +363,7 @@ vmcluster: resources: requests: storage: 2Gi - resources: - {} + resources: {} # limits: # cpu: "1" # memory: "1000Mi" @@ -379,8 +376,7 @@ vmcluster: port: "8480" replicaCount: 2 extraArgs: {} - resources: - {} + resources: {} # limits: # cpu: "1" # memory: 1000Mi @@ -473,8 +469,7 @@ vmcluster: enabled: false # -- Ingress annotations - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -640,8 +635,7 @@ alertmanager: enabled: true # -- (object) Extra alert templates - templateFiles: - {} + templateFiles: {} # template_1.tmpl: |- # {{ define "hello" -}} # hello, Victoria! @@ -655,8 +649,7 @@ alertmanager: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -699,8 +692,7 @@ vmalert: externalLabels: {} # -- (object) Extra VMAlert annotation templates - templateFiles: - {} + templateFiles: {} # template_1.tmpl: |- # {{ define "hello" -}} # hello, Victoria! @@ -723,8 +715,7 @@ vmalert: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -791,7 +782,7 @@ vmagent: port: "8429" selectAllByDefault: true scrapeInterval: 20s - externalLabels: + externalLabels: cluster_environment: "observability" # For multi-cluster setups it is useful to use "cluster" label to identify the metrics source. # For example: @@ -808,8 +799,7 @@ vmagent: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -868,7 +858,7 @@ defaultDatasources: implementation: prometheus # -- Configure additional grafana datasources (passed through tpl). # Check [here](http://docs.grafana.org/administration/provisioning/#datasources) for details - extra: + extra: - name: victoria-logs access: proxy type: VictoriaLogs @@ -912,8 +902,7 @@ grafana: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated - annotations: - {} + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} @@ -947,7 +936,7 @@ grafana: matchLabels: app.kubernetes.io/name: '{{ include "grafana.name" .Subcharts.grafana }}' endpoints: - - port: '{{ .Values.grafana.service.portName }}' + - port: "{{ .Values.grafana.service.portName }}" # -- prometheus-node-exporter dependency chart configuration. For possible values check [here](https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-node-exporter/values.yaml) prometheus-node-exporter: @@ -1078,7 +1067,7 @@ kubeApiServer: # Component scraping the kube controller manager kubeControllerManager: # -- Enable kube controller manager metrics scraping - enabled: true + enabled: false # -- If your kube controller manager is not deployed as a pod, specify IPs it can be found on endpoints: [] @@ -1211,7 +1200,7 @@ kubeEtcd: # Component scraping kube scheduler kubeScheduler: # -- Enable KubeScheduler metrics scraping - enabled: true + enabled: false # -- If your kube scheduler is not deployed as a pod, specify IPs it can be found on endpoints: [] @@ -1285,4 +1274,3 @@ kubeProxy: # -- Add extra objects dynamically to this chart extraObjects: [] -