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

Fix fleet.migration.total log key overlap #1951

Merged
merged 3 commits into from
Oct 6, 2022
Merged

Fix fleet.migration.total log key overlap #1951

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ad5434
Fix fleet.migration.total log key overlap
joshdover Oct 5, 2022
b267e7a
Changelog
joshdover Oct 5, 2022
6b1487f
Merge branch 'main' into fx-migration-log
AndersonQ Oct 6, 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.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Update apikey.cache_hit log field name to match convention. {pull}1900[1900]
- LoadServerLimits will not overwrite specified limits when loading default/agent number specified values. {issue}1841[1841] {pull}1912[1912]
- Use seperate rate limiters for internal and external API listeners. {issue}1859[1859] {pull}1904[1904]
- Fix fleet.migration.total log key overlap {pull}1951[1951]

==== New Features

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/dl/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ func applyMigration(ctx context.Context, name string, index string, bulker bulk.
Str("fleet.migration.name", name).
Int("fleet.migration.es.took", resp.Took).
Bool("fleet.migration.es.timed_out", resp.TimedOut).
Int("fleet.migration.total", resp.Total).
Int("fleet.migration.updated", resp.Updated).
Int("fleet.migration.deleted", resp.Deleted).
Int("fleet.migration.batches", resp.Batches).
Expand All @@ -132,6 +131,7 @@ func applyMigration(ctx context.Context, name string, index string, bulker bulk.
Int("fleet.migration.retries.bulk", resp.Retries.Bulk).
Int("fleet.migration.retries.search", resp.Retries.Search).
Dur("fleet.migration.total.duration", time.Since(start)).
Int("fleet.migration.total.count", resp.Total).
Msgf("migration %s done", name)

for _, fail := range resp.Failures {
Expand Down