Update agent version and enable clustering

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
This commit is contained in:
Michel Hollands 2024-03-27 10:02:40 +00:00
parent 1bffcac5e5
commit 019f2b7b1e
6 changed files with 26 additions and 6 deletions

View File

@ -4,7 +4,7 @@ dependencies:
version: 5.8.0 version: 5.8.0
- name: grafana-agent - name: grafana-agent
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 0.15.0 version: 0.37.0
- name: mimir-distributed - name: mimir-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 4.4.1 version: 4.4.1
@ -14,5 +14,5 @@ dependencies:
- name: minio - name: minio
repository: https://charts.min.io repository: https://charts.min.io
version: 5.0.11 version: 5.0.11
digest: sha256:da0e744b5046eb7972e0bf82d1d0ba4786e9600af63b65f35b16118105248074 digest: sha256:31eae0a46ac4af90db6054af2f3eb15f65affd18dd350cfc2d9e56ae8cb9a3a8
generated: "2023-08-18T10:58:08.978123+01:00" generated: "2024-03-27T09:18:20.213047Z"

View File

@ -30,7 +30,7 @@ dependencies:
condition: local.logs.enabled condition: local.logs.enabled
- name: grafana-agent - name: grafana-agent
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: "0.15.0" version: "0.37.0"
- name: mimir-distributed - name: mimir-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: "4.4.1" version: "4.4.1"

Binary file not shown.

View File

@ -41,6 +41,9 @@ data:
{{- if or .Values.local.logs.enabled .Values.cloud.logs.enabled }} {{- if or .Values.local.logs.enabled .Values.cloud.logs.enabled }}
loki.source.kubernetes "pods" { loki.source.kubernetes "pods" {
clustering {
enabled = true
}
targets = discovery.relabel.rename_meta_labels.output targets = discovery.relabel.rename_meta_labels.output
forward_to = [ {{ include "agent.loki_process_targets" . }} ] forward_to = [ {{ include "agent.loki_process_targets" . }} ]
} }
@ -73,12 +76,18 @@ data:
{{- if or .Values.local.metrics.enabled .Values.cloud.metrics.enabled }} {{- if or .Values.local.metrics.enabled .Values.cloud.metrics.enabled }}
prometheus.scrape "pods" { prometheus.scrape "pods" {
clustering {
enabled = true
}
targets = discovery.relabel.rename_meta_labels.output targets = discovery.relabel.rename_meta_labels.output
forward_to = [ {{ include "agent.prometheus_write_targets" . }} ] forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
} }
{{- if .Values.kubeStateMetrics.enabled }} {{- if .Values.kubeStateMetrics.enabled }}
prometheus.scrape "kubeStateMetrics" { prometheus.scrape "kubeStateMetrics" {
clustering {
enabled = true
}
targets = [ { "__address__" = "{{ .Values.kubeStateMetrics.endpoint }}" } ] targets = [ { "__address__" = "{{ .Values.kubeStateMetrics.endpoint }}" } ]
forward_to = [ {{ include "agent.prometheus_write_targets" . }} ] forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
} }
@ -118,6 +127,9 @@ data:
} }
prometheus.scrape "cadvisor" { prometheus.scrape "cadvisor" {
clustering {
enabled = true
}
targets = discovery.relabel.all_nodes.output targets = discovery.relabel.all_nodes.output
forward_to = [ {{ include "agent.prometheus_write_targets" . }} ] forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
@ -132,6 +144,9 @@ data:
} }
prometheus.scrape "kubelet" { prometheus.scrape "kubelet" {
clustering {
enabled = true
}
targets = discovery.relabel.all_nodes.output targets = discovery.relabel.all_nodes.output
forward_to = [ {{ include "agent.prometheus_write_targets" . }} ] forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
@ -145,10 +160,13 @@ data:
} }
} }
prometheus.exporter.unix {} prometheus.exporter.unix "promexporter" {}
prometheus.scrape "node_exporter" { prometheus.scrape "node_exporter" {
targets = prometheus.exporter.unix.targets clustering {
enabled = true
}
targets = prometheus.exporter.unix.promexporter.targets
forward_to = [prometheus.relabel.node_exporter.receiver] forward_to = [prometheus.relabel.node_exporter.receiver]
job_name = "node-exporter" job_name = "node-exporter"

View File

@ -118,6 +118,8 @@ loki:
grafana-agent: grafana-agent:
agent: agent:
clustering:
enabled: true
configMap: configMap:
create: false create: false
name: "agent-configmap" name: "agent-configmap"