Merge remote-tracking branch 'upstream/master' into helm_timeouts

.gitignore

README.md

cmd/promtail/main.go

docs/logcli.md

docs/promtail-setup.md

docs/troubleshooting.md

pkg/ingester/ingester_test.go

pkg/promtail/api/entry_parser.go

pkg/promtail/api/entry_parser_test.go

pkg/promtail/client/client.go

pkg/promtail/promtail_test.go

production/README.md

production/helm/Chart.yaml

production/helm/templates/loki/_helpers.tpl

production/helm/templates/loki/deployment.yaml

production/helm/templates/promtail/_helpers.tpl

production/helm/templates/promtail/configmap.yaml

production/helm/values.yaml