mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 06:59:40 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

tweaks for e2e

Browse source
This commit is contained in:
Owen Williams 2024-02-08 14:42:12 -05:00
parent 85c3d93797
commit d76a8cab73
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/prometheus/main.go
View file

@ -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

2
go.mod
View file

@ -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 (