diff --git a/cmd/fluent-bit/config.go b/cmd/fluent-bit/config.go index 85604ae60c53..6b9bb6d701b4 100644 --- a/cmd/fluent-bit/config.go +++ b/cmd/fluent-bit/config.go @@ -258,5 +258,19 @@ func parseConfig(cfg ConfigGetter) (*config, error) { res.bufferConfig.dqueConfig.queueName = queueName } + res.clientConfig.Client.TLSConfig.CAFile = cfg.Get("ca_file") + res.clientConfig.Client.TLSConfig.CertFile = cfg.Get("cert_file") + res.clientConfig.Client.TLSConfig.KeyFile = cfg.Get("key_file") + + insecureSkipVerify := cfg.Get("insecure_skip_verify") + switch queueSync { + case "false", "": + res.bufferConfig.dqueConfig.queueSync = false + case "true": + res.bufferConfig.dqueConfig.queueSync = true + default: + return nil, fmt.Errorf("invalid string insecure_skip_verify: %v", insecureSkipVerify) + } + return res, nil } diff --git a/cmd/fluent-bit/out_loki.go b/cmd/fluent-bit/out_loki.go index ccfe8cfaafd8..62ed94525882 100644 --- a/cmd/fluent-bit/out_loki.go +++ b/cmd/fluent-bit/out_loki.go @@ -77,6 +77,11 @@ func FLBPluginInit(ctx unsafe.Pointer) int { level.Info(paramLogger).Log("DqueDir", conf.bufferConfig.dqueConfig.queueDir) level.Info(paramLogger).Log("DqueSegmentSize", conf.bufferConfig.dqueConfig.queueSegmentSize) level.Info(paramLogger).Log("DqueSync", conf.bufferConfig.dqueConfig.queueSync) + level.Info(paramLogger).Log("ca_file", conf.clientConfig.Client.TLSConfig.CAFile) + level.Info(paramLogger).Log("cert_file", conf.clientConfig.Client.TLSConfig.CertFile) + level.Info(paramLogger).Log("key_file", conf.clientConfig.Client.TLSConfig.KeyFile) + level.Info(paramLogger).Log("insecure_skip_verify", conf.clientConfig.Client.TLSConfig.InsecureSkipVerify) + plugin, err := newPlugin(conf, logger) if err != nil { level.Error(logger).Log("newPlugin", err)