Skip to content

Commit

Permalink
Fix fleet.migration.total log key overlap (#1951) (#1962)
Browse files Browse the repository at this point in the history
Co-authored-by: Anderson Queiroz <anderson.queiroz@elastic.co>
(cherry picked from commit 60ba1cf)

Co-authored-by: Josh Dover <1813008+joshdover@users.noreply.github.com>
  • Loading branch information
mergify[bot] and joshdover authored Oct 6, 2022
1 parent dbd7891 commit 1427ef7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Fix issue were errors where being ignored written to elasticsearch. {pull}1896[1896]
- 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
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

0 comments on commit 1427ef7

Please sign in to comment.