mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-30 07:03:06 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-matcher-string-with-empty-label-name

Browse source
This commit is contained in:
Bryan Boreham 2024-06-19 06:13:21 -04:00 committed by GitHub
parent 84602bbace f45b0fd9ef
commit 6685cbc234
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.golangci.yml
View file

@ -29,6 +29,7 @@ linters:
- unused - unused
- usestdlibvars - usestdlibvars
- whitespace - whitespace
- loggercheck
issues: issues:
max-same-issues: 0 max-same-issues: 0

2
util/treecache/treecache.go
View file

@ -200,7 +200,7 @@ func (tc *ZookeeperTreeCache) loop(path string) {
failure() failure()
} else { } else {
tc.resyncState(tc.prefix, tc.head, previousState) tc.resyncState(tc.prefix, tc.head, previousState)
level.Info(tc.logger).Log("Zookeeper resync successful") level.Info(tc.logger).Log("msg", "Zookeeper resync successful")
failureMode = false failureMode = false
} }
case <-tc.stop: case <-tc.stop: