Skip to content

Commit 2e8bc15

Browse files
axwaxw
committed
apmpackage: sort internal metrics data stream
Sort internal metrics by @timestamp, to speed up time range queries.
1 parent 80057a4 commit 2e8bc15

File tree

8 files changed

+40
-31
lines changed

8 files changed

+40
-31
lines changed

‎apmpackage/apm/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# newer versions go on top
22
#
33
# change type can be one of: enhancement, bugfix, breaking-change
4+
- version: "0.5.0"
5+
changes:
6+
- description: define index sorting
7+
type: enhancement
8+
link: https://github.com/elastic/apm-server/pull/TODO
49
- version: "0.4.0"
510
changes:
611
- description: add anonymous auth config, replace some RUM config

‎apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"processors": [
44
{
55
"pipeline": {
6-
"name": "metrics-apm.app-0.4.0-apm_ingest_timestamp"
6+
"name": "metrics-apm.app-0.5.0-apm_ingest_timestamp"
77
}
88
},
99
{
1010
"pipeline": {
11-
"name": "metrics-apm.app-0.4.0-apm_user_agent"
11+
"name": "metrics-apm.app-0.5.0-apm_user_agent"
1212
}
1313
},
1414
{
1515
"pipeline": {
16-
"name": "metrics-apm.app-0.4.0-apm_user_geo"
16+
"name": "metrics-apm.app-0.5.0-apm_user_geo"
1717
}
1818
},
1919
{
2020
"pipeline": {
21-
"name": "metrics-apm.app-0.4.0-apm_remove_span_metadata"
21+
"name": "metrics-apm.app-0.5.0-apm_remove_span_metadata"
2222
}
2323
},
2424
{
2525
"pipeline": {
26-
"name": "metrics-apm.app-0.4.0-apm_error_grouping_name",
26+
"name": "metrics-apm.app-0.5.0-apm_error_grouping_name",
2727
"if": "ctx.processor?.event == 'error'"
2828
}
2929
},
3030
{
3131
"pipeline": {
32-
"name": "metrics-apm.app-0.4.0-apm_metrics_dynamic_template",
32+
"name": "metrics-apm.app-0.5.0-apm_metrics_dynamic_template",
3333
"if": "ctx.processor?.event == 'metric'"
3434
}
3535
}

‎apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"processors": [
44
{
55
"pipeline": {
6-
"name": "logs-apm.error-0.4.0-apm_ingest_timestamp"
6+
"name": "logs-apm.error-0.5.0-apm_ingest_timestamp"
77
}
88
},
99
{
1010
"pipeline": {
11-
"name": "logs-apm.error-0.4.0-apm_user_agent"
11+
"name": "logs-apm.error-0.5.0-apm_user_agent"
1212
}
1313
},
1414
{
1515
"pipeline": {
16-
"name": "logs-apm.error-0.4.0-apm_user_geo"
16+
"name": "logs-apm.error-0.5.0-apm_user_geo"
1717
}
1818
},
1919
{
2020
"pipeline": {
21-
"name": "logs-apm.error-0.4.0-apm_remove_span_metadata"
21+
"name": "logs-apm.error-0.5.0-apm_remove_span_metadata"
2222
}
2323
},
2424
{
2525
"pipeline": {
26-
"name": "logs-apm.error-0.4.0-apm_error_grouping_name",
26+
"name": "logs-apm.error-0.5.0-apm_error_grouping_name",
2727
"if": "ctx.processor?.event == 'error'"
2828
}
2929
},
3030
{
3131
"pipeline": {
32-
"name": "logs-apm.error-0.4.0-apm_metrics_dynamic_template",
32+
"name": "logs-apm.error-0.5.0-apm_metrics_dynamic_template",
3333
"if": "ctx.processor?.event == 'metric'"
3434
}
3535
}

‎apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"processors": [
44
{
55
"pipeline": {
6-
"name": "metrics-apm.internal-0.4.0-apm_ingest_timestamp"
6+
"name": "metrics-apm.internal-0.5.0-apm_ingest_timestamp"
77
}
88
},
99
{
1010
"pipeline": {
11-
"name": "metrics-apm.internal-0.4.0-apm_user_agent"
11+
"name": "metrics-apm.internal-0.5.0-apm_user_agent"
1212
}
1313
},
1414
{
1515
"pipeline": {
16-
"name": "metrics-apm.internal-0.4.0-apm_user_geo"
16+
"name": "metrics-apm.internal-0.5.0-apm_user_geo"
1717
}
1818
},
1919
{
2020
"pipeline": {
21-
"name": "metrics-apm.internal-0.4.0-apm_remove_span_metadata"
21+
"name": "metrics-apm.internal-0.5.0-apm_remove_span_metadata"
2222
}
2323
},
2424
{
2525
"pipeline": {
26-
"name": "metrics-apm.internal-0.4.0-apm_error_grouping_name",
26+
"name": "metrics-apm.internal-0.5.0-apm_error_grouping_name",
2727
"if": "ctx.processor?.event == 'error'"
2828
}
2929
},
3030
{
3131
"pipeline": {
32-
"name": "metrics-apm.internal-0.4.0-apm_metrics_dynamic_template",
32+
"name": "metrics-apm.internal-0.5.0-apm_metrics_dynamic_template",
3333
"if": "ctx.processor?.event == 'metric'"
3434
}
3535
}

‎apmpackage/apm/data_stream/internal_metrics/manifest.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ elasticsearch:
88
# Internal metrics should have all fields strictly mapped;
99
# we are in full control of the field names.
1010
dynamic: strict
11+
settings:
12+
index:
13+
sort.field: "@timestamp"
14+
sort.order: desc

‎apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"processors": [
44
{
55
"pipeline": {
6-
"name": "metrics-apm.profiling-0.4.0-apm_ingest_timestamp"
6+
"name": "metrics-apm.profiling-0.5.0-apm_ingest_timestamp"
77
}
88
},
99
{
1010
"pipeline": {
11-
"name": "metrics-apm.profiling-0.4.0-apm_user_agent"
11+
"name": "metrics-apm.profiling-0.5.0-apm_user_agent"
1212
}
1313
},
1414
{
1515
"pipeline": {
16-
"name": "metrics-apm.profiling-0.4.0-apm_user_geo"
16+
"name": "metrics-apm.profiling-0.5.0-apm_user_geo"
1717
}
1818
},
1919
{
2020
"pipeline": {
21-
"name": "metrics-apm.profiling-0.4.0-apm_remove_span_metadata"
21+
"name": "metrics-apm.profiling-0.5.0-apm_remove_span_metadata"
2222
}
2323
},
2424
{
2525
"pipeline": {
26-
"name": "metrics-apm.profiling-0.4.0-apm_error_grouping_name",
26+
"name": "metrics-apm.profiling-0.5.0-apm_error_grouping_name",
2727
"if": "ctx.processor?.event == 'error'"
2828
}
2929
},
3030
{
3131
"pipeline": {
32-
"name": "metrics-apm.profiling-0.4.0-apm_metrics_dynamic_template",
32+
"name": "metrics-apm.profiling-0.5.0-apm_metrics_dynamic_template",
3333
"if": "ctx.processor?.event == 'metric'"
3434
}
3535
}

‎apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/default.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"processors": [
44
{
55
"pipeline": {
6-
"name": "traces-apm-0.4.0-apm_ingest_timestamp"
6+
"name": "traces-apm-0.5.0-apm_ingest_timestamp"
77
}
88
},
99
{
1010
"pipeline": {
11-
"name": "traces-apm-0.4.0-apm_user_agent"
11+
"name": "traces-apm-0.5.0-apm_user_agent"
1212
}
1313
},
1414
{
1515
"pipeline": {
16-
"name": "traces-apm-0.4.0-apm_user_geo"
16+
"name": "traces-apm-0.5.0-apm_user_geo"
1717
}
1818
},
1919
{
2020
"pipeline": {
21-
"name": "traces-apm-0.4.0-apm_remove_span_metadata"
21+
"name": "traces-apm-0.5.0-apm_remove_span_metadata"
2222
}
2323
},
2424
{
2525
"pipeline": {
26-
"name": "traces-apm-0.4.0-apm_error_grouping_name",
26+
"name": "traces-apm-0.5.0-apm_error_grouping_name",
2727
"if": "ctx.processor?.event == 'error'"
2828
}
2929
},
3030
{
3131
"pipeline": {
32-
"name": "traces-apm-0.4.0-apm_metrics_dynamic_template",
32+
"name": "traces-apm-0.5.0-apm_metrics_dynamic_template",
3333
"if": "ctx.processor?.event == 'metric'"
3434
}
3535
}

‎apmpackage/apm/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 1.0.0
22
name: apm
33
title: Elastic APM
4-
version: 0.4.0
4+
version: 0.5.0
55
license: basic
66
description: Ingest APM data
77
type: integration

0 commit comments

Comments
 (0)