From ceffcb74acfcd58c1b5c838ec3d8f23f07be42ff Mon Sep 17 00:00:00 2001
From: Steven Sheehy <ssheehy@firescope.com>
Date: Tue, 7 May 2019 15:04:25 -0500
Subject: [PATCH] Support CRI 1.14+ directory change
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
---
docs/troubleshooting.md | 17 -----------------
production/helm/loki-stack/Chart.yaml | 2 +-
production/helm/promtail/Chart.yaml | 2 +-
production/helm/promtail/values.yaml | 11 +++++------
.../ksonnet/promtail/scrape_config.libsonnet | 2 +-
tools/promtail.sh | 10 +++++-----
6 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 07517ce6..5d09932f 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -23,23 +23,6 @@ This can have several reasons:
- Detect this by turning on debug logging and then look for `dropping target, no labels` or `ignoring target` messages.
- Promtail cannot find the location of your log files. Check that the scrape_configs contains valid path setting for finding the logs in your worker nodes.
- Your pods are running but not with the labels Promtail is expecting. Check the Promtail scape_configs.
-- Kubernetes 1.14+ and GKE 1.12+: the default scape_configs need to be adapted to work.
-From
-```
- - replacement: /var/log/pods/$1/*.log
- separator: /
- source_labels:
- - __meta_kubernetes_pod_uid
- - __meta_kubernetes_pod_container_name
- target_label: __path__
-```
-to
-```
- - replacement: /var/log/pods/*$1*/*/*.log
- source_labels:
- - __meta_kubernetes_pod_uid
- target_label: __path__
-```
## Troubleshooting targets
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
index 777922dc..09803be5 100644
--- a/production/helm/loki-stack/Chart.yaml
+++ b/production/helm/loki-stack/Chart.yaml
@@ -1,5 +1,5 @@
name: loki-stack
-version: 0.8.0
+version: 0.8.1
appVersion: 0.0.1
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
index 806b1209..97c5129a 100644
--- a/production/helm/promtail/Chart.yaml
+++ b/production/helm/promtail/Chart.yaml
@@ -1,5 +1,5 @@
name: promtail
-version: 0.7.0
+version: 0.7.1
appVersion: 0.0.1
kubeVersion: "^1.10.0-0"
description: "Responsible for gathering logs and sending them to Loki"
diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
index 5d31ea2c..b2020dbd 100644
--- a/production/helm/promtail/values.yaml
+++ b/production/helm/promtail/values.yaml
@@ -160,7 +160,7 @@ config:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -206,7 +206,7 @@ config:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -258,7 +258,7 @@ config:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -312,7 +312,7 @@ config:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -359,10 +359,9 @@ config:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_annotation_kubernetes_io_config_mirror
- __meta_kubernetes_pod_container_name
target_label: __path__
-
diff --git a/production/ksonnet/promtail/scrape_config.libsonnet b/production/ksonnet/promtail/scrape_config.libsonnet
index 35dddbcd..81eba885 100644
--- a/production/ksonnet/promtail/scrape_config.libsonnet
+++ b/production/ksonnet/promtail/scrape_config.libsonnet
@@ -64,7 +64,7 @@ config + {
source_labels: [pod_uid, '__meta_kubernetes_pod_container_name'],
target_label: '__path__',
separator: '/',
- replacement: '/var/log/pods/$1/*.log',
+ replacement: '/var/log/pods/*$1/*.log',
},
],
},
diff --git a/tools/promtail.sh b/tools/promtail.sh
index aae6c854..29a4bba2 100755
--- a/tools/promtail.sh
+++ b/tools/promtail.sh
@@ -53,7 +53,7 @@ data:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -99,7 +99,7 @@ data:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -151,7 +151,7 @@ data:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -205,7 +205,7 @@ data:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_uid
@@ -252,7 +252,7 @@ data:
target_label: container_name
- action: labelmap
regex: __meta_kubernetes_pod_label_(.+)
- - replacement: /var/log/pods/$1/*.log
+ - replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
- __meta_kubernetes_pod_annotation_kubernetes_io_config_mirror
--
GitLab