diff --git a/docs/projects/kubernetes_monitoring/index.md b/docs/projects/kubernetes_monitoring/index.md index 8084599..c15856f 100644 --- a/docs/projects/kubernetes_monitoring/index.md +++ b/docs/projects/kubernetes_monitoring/index.md @@ -113,6 +113,8 @@ This helm chart started off with components from multiple open-source projects. - Prometheus-Adaptor + - Promtail + - Thanos - kyverno policies _(optional, set in values.yaml)_ diff --git a/templates/ConfigMap-GrafanaAgent.yaml b/templates/ConfigMap-GrafanaAgent.yaml index 623ea72..7d4d4a7 100644 --- a/templates/ConfigMap-GrafanaAgent.yaml +++ b/templates/ConfigMap-GrafanaAgent.yaml @@ -16,6 +16,8 @@ data: metrics: wal_directory: /tmp/wal + + logs: positions_directory: "/tmp" @@ -254,7 +256,6 @@ data: netclass_ignored_devices: "^(veth.*|cali.*|[a-f0-9]{15})$" netdev_device_exclude: "^(veth.*|cali.*|[a-f0-9]{15})$" - scrape_integration: true include_exporter_metrics: true enable_collectors: diff --git a/templates/ServiceMonitor-Node.yaml b/templates/ServiceMonitor-Node.yaml index e1d32c3..df88e17 100644 --- a/templates/ServiceMonitor-Node.yaml +++ b/templates/ServiceMonitor-Node.yaml @@ -35,6 +35,42 @@ spec: sourceLabels: - __meta_kubernetes_pod_node_name targetLabel: node + metricRelabelings: + - action: drop + sourceLabels: [__name__] + regex: '(promtail_).*' + + - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + interval: 5s + honorLabels: true + path: /metrics + port: grafana-metrics + scheme: http + relabelings: + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: instance + - targetLabel: "job" + replacement: "promtail" + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: node + - action: replace + separator: / + sourceLabels: + - namespace + - job + targetLabel: job + metricRelabelings: + - action: keep + sourceLabels: [__name__] + regex: '(promtail_).*' selector: matchLabels: app.kubernetes.io/instance: k8s