From d76a8cab73abdd0b00b76caf6ccc66107c67baa2 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Thu, 8 Feb 2024 14:42:12 -0500 Subject: [PATCH] tweaks for e2e --- cmd/prometheus/main.go | 8 +++++++- go.mod | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index a5b372b20..c53726bed 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -534,7 +534,8 @@ func main() { level.Error(logger).Log("msg", fmt.Sprintf("Error loading config (--config.file=%s)", cfg.configFile), "file", absPath, "err", err) os.Exit(2) } - if _, err := cfgFile.GetScrapeConfigs(); err != nil { + cfgs, err := cfgFile.GetScrapeConfigs() + if err != nil { absPath, pathErr := filepath.Abs(cfg.configFile) if pathErr != nil { absPath = cfg.configFile @@ -542,6 +543,11 @@ func main() { level.Error(logger).Log("msg", fmt.Sprintf("Error loading scrape config files from config (--config.file=%q)", cfg.configFile), "file", absPath, "err", err) os.Exit(2) } + + for _, c := range cfgs { + level.Info(logger).Log("msg", fmt.Sprintf("utf8????? %v", c.AllowUTF8Names)) + } + if cfg.tsdb.EnableExemplarStorage { if cfgFile.StorageConfig.ExemplarsConfig == nil { cfgFile.StorageConfig.ExemplarsConfig = &config.DefaultExemplarsConfig diff --git a/go.mod b/go.mod index 517cfec83..887ce4f8a 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( k8s.io/apimachinery v0.28.6 k8s.io/client-go v0.28.6 k8s.io/klog v1.0.0 - k8s.io/klog/v2 v2.120.1 + k8s.io/klog/v2 v2.110.1 ) require (