From a66513f5b6f161343273b0a5ac0960b0d9325328 Mon Sep 17 00:00:00 2001 From: Nurlan Moldomurov Date: Thu, 5 Oct 2023 15:08:29 +0300 Subject: [PATCH] PMM-12154 compatibility improvements. --- cmd/postgres_exporter/main.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/postgres_exporter/main.go b/cmd/postgres_exporter/main.go index acce68f4..2577a0f3 100644 --- a/cmd/postgres_exporter/main.go +++ b/cmd/postgres_exporter/main.go @@ -41,8 +41,12 @@ var ( Config: &config.Config{}, } - configFile = kingpin.Flag("config.file", "Postgres exporter configuration file.").Default("postgres_exporter.yml").String() - webConfig = kingpinflag.AddFlags(kingpin.CommandLine, ":9187") + configFile = kingpin.Flag("config.file", "Postgres exporter configuration file.").Default("postgres_exporter.yml").String() + webConfig = kingpinflag.AddFlags(kingpin.CommandLine, ":9187") + webConfigFile = kingpin.Flag( + "web.config", + "[EXPERIMENTAL] Path to config yaml file that can enable TLS or authentication.", + ).Default("").String() // added for compatibility reasons to not break it in PMM 2. metricsPath = kingpin.Flag("web.telemetry-path", "Path under which to expose metrics.").Default("/metrics").Envar("PG_EXPORTER_WEB_TELEMETRY_PATH").String() disableDefaultMetrics = kingpin.Flag("disable-default-metrics", "Do not include default metrics.").Default("false").Envar("PG_EXPORTER_DISABLE_DEFAULT_METRICS").Bool() disableSettingsMetrics = kingpin.Flag("disable-settings-metrics", "Do not include pg_settings metrics.").Default("false").Envar("PG_EXPORTER_DISABLE_SETTINGS_METRICS").Bool() @@ -76,6 +80,7 @@ func main() { promlogConfig := &promlog.Config{} flag.AddFlags(kingpin.CommandLine, promlogConfig) kingpin.HelpFlag.Short('h') + webConfig.WebConfigFile = webConfigFile kingpin.Parse() logger = promlog.New(promlogConfig)