Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Loki
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

5d971cd8

Unverified Commit 5d971cd8 authored 6 years ago by Anthony Woods Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #314 from grafana/20190212-fixPromtailKsonnet

dont add pods twice if they have app and name labels

parents 6362534d 182e2654

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

production/helm/templates/promtail/configmap.yaml 4 additions, 0 deletions

production/helm/templates/promtail/configmap.yaml
production/ksonnet/promtail/promtail.libsonnet 8 additions, 0 deletions

production/ksonnet/promtail/promtail.libsonnet
tools/promtail.sh 4 additions, 0 deletions

tools/promtail.sh

with 16 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment