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

3c78f35c

Unverified Commit 3c78f35c authored 6 years ago by Xiang Dai Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into enable-loki

parents 3fc4873b a6d8bf03

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

fluentd/fluent-plugin-loki/Dockerfile 20 additions, 17 deletions

fluentd/fluent-plugin-loki/Dockerfile
fluentd/fluent-plugin-loki/README.md 38 additions, 0 deletions

fluentd/fluent-plugin-loki/README.md
fluentd/fluent-plugin-loki/docker/conf/loki.conf 1 addition, 1 deletion

fluentd/fluent-plugin-loki/docker/conf/loki.conf
production/helm/Chart.yaml 1 addition, 1 deletion

production/helm/Chart.yaml
production/helm/templates/loki/deployment.yaml 2 additions, 0 deletions

production/helm/templates/loki/deployment.yaml
production/helm/templates/loki/networkpolicy.yaml 25 additions, 0 deletions

production/helm/templates/loki/networkpolicy.yaml
production/helm/templates/promtail/daemonset.yaml 7 additions, 12 deletions

production/helm/templates/promtail/daemonset.yaml
production/helm/values.yaml 36 additions, 5 deletions

production/helm/values.yaml
production/ksonnet/README.md 4 additions, 4 deletions

production/ksonnet/README.md
production/ksonnet/promtail/promtail.libsonnet 2 additions, 2 deletions

production/ksonnet/promtail/promtail.libsonnet
tools/promtail.sh 5 additions, 5 deletions

tools/promtail.sh

with 141 additions and 47 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