From 3606801b332fcd28eac881e09f353fc658151fa4 Mon Sep 17 00:00:00 2001 From: 3Xpl0it3r Date: Fri, 23 Apr 2021 09:54:16 +0800 Subject: [PATCH 1/2] fix the promtail-default-config download link in doc --- docs/sources/installation/local.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/local.md b/docs/sources/installation/local.md index 8d37e710e6c50..91aa699ea63d5 100644 --- a/docs/sources/installation/local.md +++ b/docs/sources/installation/local.md @@ -17,7 +17,7 @@ In order to log events with Loki, you must download and install both Promtail an 5. In the command line, change directory (`cd` on most systems) to the directory with Loki and Promtail. Copy and paste the commands below into your command line to download generic configuration files: ``` wget https://raw.githubusercontent.com/grafana/loki/master/cmd/loki/loki-local-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/master/cmd/promtail/promtail-local-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/main/clients/cmd/promtail/promtail-local-config.yaml ``` 6. Enter the following command to start Loki: From 019e01033128e1fd0fd7e9327ea1d428fa9fb2eb Mon Sep 17 00:00:00 2001 From: 3Xpl0it3r Date: Fri, 14 May 2021 14:45:28 +0800 Subject: [PATCH 2/2] remove duplicated code --- clients/cmd/docker-driver/config.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/clients/cmd/docker-driver/config.go b/clients/cmd/docker-driver/config.go index 4698c7972aef6..c6b19375cebf2 100644 --- a/clients/cmd/docker-driver/config.go +++ b/clients/cmd/docker-driver/config.go @@ -184,9 +184,6 @@ func parseConfig(logCtx logger.Info) (*config, error) { if tlsCertFile, ok := logCtx.Config[cfgTLSCertFileKey]; ok { clientConfig.Client.TLSConfig.CertFile = tlsCertFile } - if tlsCertFile, ok := logCtx.Config[cfgTLSCertFileKey]; ok { - clientConfig.Client.TLSConfig.CertFile = tlsCertFile - } if tlsKeyFile, ok := logCtx.Config[cfgTLSKeyFileKey]; ok { clientConfig.Client.TLSConfig.KeyFile = tlsKeyFile }