diff --git a/production/helm/templates/promtail/daemonset.yaml b/production/helm/templates/promtail/daemonset.yaml index 56c4bce2101ad2ecf882ef5b2f0c90ea963fd9fe..b3cbd6ce004e213f15c8d953ca31739a5e7eea3c 100644 --- a/production/helm/templates/promtail/daemonset.yaml +++ b/production/helm/templates/promtail/daemonset.yaml @@ -48,7 +48,7 @@ spec: - name: varlog mountPath: /var/log - name: varlibdockercontainers - mountPath: {{ .Values.promtail.dockerRoot }}/containers + mountPath: {{ .Values.promtail.containerRootPath }}/containers readOnly: true env: - name: HOSTNAME @@ -94,4 +94,4 @@ spec: path: /var/log - name: varlibdockercontainers hostPath: - path: {{ .Values.promtail.dockerRoot }}/containers + path: {{ .Values.promtail.containerRootPath }}/containers diff --git a/production/helm/values.yaml b/production/helm/values.yaml index 5def64d8a92e09ed1d5f54940b60ba7711647541..c1364a9b8a05e6c6d3212f1358fa996c12a1374a 100644 --- a/production/helm/values.yaml +++ b/production/helm/values.yaml @@ -98,7 +98,7 @@ promtail: deploymentStrategy: RollingUpdate entryParser: docker - dockerRoot: /var/lib/docker + containerRootPath: /var/lib/docker image: repository: grafana/promtail diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet index ea600a9e445520ebbdfbee695af9d78be2fe4593..4f41709d0f7a80e9a69ec793b1a15f64d8d96da1 100644 --- a/production/ksonnet/promtail/promtail.libsonnet +++ b/production/ksonnet/promtail/promtail.libsonnet @@ -12,7 +12,7 @@ k { password: '', scheme: 'https', hostname: 'logs-us-west1.grafana.net', - dataroot: '/var/lib/docker', + container_root_path: '/var/lib/docker', external_labels: {}, }, @@ -217,5 +217,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', $._config.promtail_config.dataroot + '/containers', readOnly=true), + $.util.hostVolumeMount('varlibdockercontainers', $._config.promtail_config.container_root_path + '/containers', $._config.promtail_config.container_root_path + '/containers', readOnly=true), }