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

[7.13] Introduce metricset.name (backport #4857) #5142

Closed
wants to merge 1 commit into from
+13 −0
Closed

[7.13] Introduce metricset.name (backport #4857) #5142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions changelogs/7.12.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ https://github.com/elastic/apm-server/compare/v7.11.2\...v7.12.0[View commits]
* When tail-sampling is enabled, a default policy must be defined {pull}4729[4729]
* Support additional config options when running under Fleet {pull}4690[4690]
* Upgrade Go to 1.15.8 {pull}4733[4733]
<<<<<<< HEAD:changelogs/7.12.asciidoc
=======
* Add support for Node.js wall time profiles {pull}4728[4728]
* Add metricset.name field to metric docs {pull}4857[4857]
>>>>>>> 5f72138f0... Introduce metricset.name (#4857):changelogs/head.asciidoc

[float]
==== Deprecated
Expand Down
4 changes: 4 additions & 0 deletions include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions x-pack/apm-server/aggregation/txmetrics/aggregator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,11 @@ func TestAggregationFields(t *testing.T) {

var expected []*model.Metricset
addExpectedCount := func(expectedCount int64) {
<<<<<<< HEAD
expected = append(expected, &model.Metricset{
=======
expected = append(expected, model.Metricset{
>>>>>>> 5f72138f0... Introduce metricset.name (#4857)
Name: "transaction",
Metadata: input.Metadata,
Event: model.MetricsetEventCategorization{
Expand Down