Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tag all activity-tracker logs #3556

Merged
merged 4 commits into from
Nov 29, 2022
Merged

Tag all activity-tracker logs #3556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da79510
Tag all activity-tracker logs
colega Nov 29, 2022
80e5585
Update CHANGELOG.md
colega Nov 29, 2022
3091784
Update pkg/mimir/modules.go
colega Nov 29, 2022
2643745
Update CHANGELOG.md
colega Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
* [ENHANCEMENT] Move the validation of incoming series before the distributor's forwarding functionality, so that we don't forward invalid series. #3386 #3458
* [ENHANCEMENT] S3 bucket configuration now validates that the endpoint does not have the bucket name prefix. #3414
* [ENHANCEMENT] Ruler: Added `ruler.tls-enabled` configuration for alertmanager client. #3432
* [ENHANCEMENT] Activity tracker logs now have `component=activity-tracker` label. #3556
* [BUGFIX] Flusher: Add `Overrides` as a dependency to prevent panics when starting with `-target=flusher`. #3151
* [BUGFIX] Updated `golang.org/x/text` dependency to fix CVE-2022-32149. #3285
* [BUGFIX] Query-frontend: properly close gRPC streams to the query-scheduler to stop memory and goroutines leak. #3302
Expand Down
3 changes: 2 additions & 1 deletion pkg/mimir/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"strconv"
"time"

"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/grafana/dskit/dns"
"github.com/grafana/dskit/kv/codec"
Expand Down Expand Up @@ -132,7 +133,7 @@ func (t *Mimir) initActivityTracker() (services.Service, error) {

entries, err := activitytracker.LoadUnfinishedEntries(t.Cfg.ActivityTracker.Filepath)

l := util_log.Logger
l := log.With(util_log.Logger, "component", "activity-tracker")
if err != nil {
level.Warn(l).Log("msg", "failed to fully read file with unfinished activities", "err", err)
}
Expand Down