From e044711b08a42b589a14637a2260a3a325e96e52 Mon Sep 17 00:00:00 2001
From: woodsaj <awoods@raintank.io>
Date: Mon, 21 Jan 2019 21:53:36 +0800
Subject: [PATCH] add external_labels support to promtail ksonnet
---
production/ksonnet/promtail/promtail.libsonnet | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet
index 9088f223..51d910cc 100644
--- a/production/ksonnet/promtail/promtail.libsonnet
+++ b/production/ksonnet/promtail/promtail.libsonnet
@@ -13,6 +13,7 @@ k {
scheme: 'https',
hostname: 'logs-us-west1.grafana.net',
dataroot: '/var/lib/docker',
+ external_labels: {},
},
@@ -37,6 +38,9 @@ k {
]),
promtail_config:: {
+ client: {
+ external_labels: $._config.promtail_config.external_labels,
+ },
scrape_configs: [
{
job_name: 'kubernetes-pods',
@@ -205,5 +209,5 @@ k {
daemonSet.mixin.spec.template.spec.withServiceAccount('promtail') +
$.util.configVolumeMount('promtail', '/etc/promtail') +
$.util.hostVolumeMount('varlog', '/var/log', '/var/log') +
- $.util.hostVolumeMount('varlibdockercontainers', $._config.promtail_config.dataroot + '/containers', '/var/lib/docker/containers', readOnly=true),
+ $.util.hostVolumeMount('varlibdockercontainers', $._config.promtail_config.dataroot + '/containers', $._config.promtail_config.dataroot + '/containers', readOnly=true),
}
--
GitLab