diff --git a/production/helm/templates/promtail/configmap.yaml b/production/helm/templates/promtail/configmap.yaml index e90695e93550dd5889401ae79feb2fb3fa3e57ad..291320cb57d216c374ba85e7620c69408fd7cd85 100644 --- a/production/helm/templates/promtail/configmap.yaml +++ b/production/helm/templates/promtail/configmap.yaml @@ -36,6 +36,12 @@ data: source_labels: - __meta_kubernetes_pod_name target_label: instance + - action: replace + source_labels: + - __meta_kubernetes_container_name + target_label: container_name + - action: labelmap + regex: __meta_kubernetes_pod_label_(.+) - replacement: /var/log/pods/$1/0.log separator: / source_labels: @@ -68,6 +74,10 @@ data: source_labels: - __meta_kubernetes_pod_name target_label: instance + - action: replace + source_labels: + - __meta_kubernetes_container_name + target_label: container_name - action: labelmap regex: __meta_kubernetes_pod_label_(.+) - replacement: /var/log/pods/$1/0.log diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet index 7c85c2c5f38d6c262323d19ca998b1167dc1414d..9088f2238979b703b6203095cc18c5703d4186cf 100644 --- a/production/ksonnet/promtail/promtail.libsonnet +++ b/production/ksonnet/promtail/promtail.libsonnet @@ -82,6 +82,19 @@ k { target_label: 'instance', }, + // Include container_name label + { + source_labels: ['__meta_kubernetes_container_name'], + action: 'replace', + target_label: 'container_name', + }, + + // Also include all the other labels on the pod. + { + action: 'labelmap', + regex: '__meta_kubernetes_pod_label_(.+)', + }, + // Kubernetes puts logs under subdirectories keyed pod UID and container_name. { source_labels: ['__meta_kubernetes_pod_uid', '__meta_kubernetes_pod_container_name'], @@ -135,6 +148,13 @@ k { target_label: 'instance', }, + // Include container_name label + { + source_labels: ['__meta_kubernetes_container_name'], + action: 'replace', + target_label: 'container_name', + }, + // Also include all the other labels on the pod. { action: 'labelmap', diff --git a/tools/promtail.sh b/tools/promtail.sh index eb5eb096ef4e2536e6e0ad492f9f1cdf0fbe023d..4d36c6141615cc2b24e8704f03a6d3ca8a6a6cd6 100644 --- a/tools/promtail.sh +++ b/tools/promtail.sh @@ -42,6 +42,12 @@ data: source_labels: - __meta_kubernetes_pod_name target_label: instance + - action: replace + source_labels: + - __meta_kubernetes_container_name + target_label: container_name + - action: labelmap + regex: __meta_kubernetes_pod_label_(.+) - replacement: /var/log/pods/$1 separator: / source_labels: @@ -74,6 +80,10 @@ data: source_labels: - __meta_kubernetes_pod_name target_label: instance + - action: replace + source_labels: + - __meta_kubernetes_container_name + target_label: container_name - action: labelmap regex: __meta_kubernetes_pod_label_(.+) - replacement: /var/log/pods/$1