-
Notifications
You must be signed in to change notification settings - Fork 25.2k
[otel-data] Hide 10m and 60m aggregated metrics generated for the APM UI #114042
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.
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
Merged
gregkalapos
merged 7 commits into
elastic:main
from
gregkalapos:otel_hide_10_and_60m_aggregated_metrics
Oct 4, 2024
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9baf9a5
Hide aggregated metrics generated for the APM UI
gregkalapos e31588d
Update 30_aggregated_metrics_tests.yml
gregkalapos 4f5b20a
Merge branch 'main' into otel_hide_10_and_60m_aggregated_metrics
elasticmachine 5c2c8c4
Review feedback
gregkalapos 32014f1
Merge branch 'main' into otel_hide_10_and_60m_aggregated_metrics
elasticmachine 25bc984
Update 30_aggregated_metrics_tests.yml
gregkalapos 3fda420
Rename metrics-otel-fixed@mappings to ecs-tsdb@mappings
gregkalapos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
x-pack/plugin/otel-data/src/main/resources/component-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| version: ${xpack.oteldata.template.version} | ||
| _meta: | ||
| description: | | ||
| Default mappings that can be changed by users for | ||
| the OpenTelemetry metrics index template installed by x-pack | ||
| managed: true | ||
| template: | ||
| mappings: | ||
| dynamic_templates: | ||
| - ecs_ip: | ||
| mapping: | ||
| type: ip | ||
| path_match: [ "ip", "*.ip", "*_ip" ] | ||
| match_mapping_type: string | ||
| - all_strings_to_keywords: | ||
| mapping: | ||
| ignore_above: 1024 | ||
| type: keyword | ||
| match_mapping_type: string |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
...tel-data/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_destination.10m.otel-*"] | ||
| priority: 130 | ||
| data_stream: | ||
| hidden: true | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-10m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-10m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 10m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_destination | ||
felixbarny marked this conversation as resolved.
Show resolved
Hide resolved
|
||
39 changes: 39 additions & 0 deletions
39
...otel-data/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_destination.1m.otel-*"] | ||
| priority: 130 | ||
| data_stream: {} | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-1m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-1m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 1m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_destination |
40 changes: 40 additions & 0 deletions
40
...tel-data/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_destination.60m.otel-*"] | ||
| priority: 130 | ||
| data_stream: | ||
| hidden: true | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-60m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-60m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 60m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_destination |
40 changes: 40 additions & 0 deletions
40
...el-data/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_summary.10m.otel-*"] | ||
| priority: 130 | ||
| data_stream: | ||
| hidden: true | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-10m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-10m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 10m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_summary |
39 changes: 39 additions & 0 deletions
39
...tel-data/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_summary.1m.otel-*"] | ||
| priority: 130 | ||
| data_stream: {} | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-1m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-1m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 1m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_summary |
40 changes: 40 additions & 0 deletions
40
...el-data/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_summary.60m.otel-*"] | ||
| priority: 130 | ||
| data_stream: | ||
| hidden: true | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-60m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-60m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 60m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_summary |
40 changes: 40 additions & 0 deletions
40
...ata/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_transaction.10m.otel-*"] | ||
| priority: 130 | ||
| data_stream: | ||
| hidden: true | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-10m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-10m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 10m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_transaction |
39 changes: 39 additions & 0 deletions
39
...data/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_transaction.1m.otel-*"] | ||
| priority: 130 | ||
| data_stream: {} | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-1m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-1m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 1m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_transaction |
40 changes: 40 additions & 0 deletions
40
...ata/src/main/resources/index-templates/[email protected]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- | ||
| version: ${xpack.oteldata.template.version} | ||
| index_patterns: ["metrics-service_transaction.60m.otel-*"] | ||
| priority: 130 | ||
| data_stream: | ||
| hidden: true | ||
| allow_auto_create: true | ||
| _meta: | ||
| description: aggregated APM metrics template installed by x-pack | ||
| managed: true | ||
| composed_of: | ||
| - metrics@tsdb-settings | ||
| - otel@mappings | ||
| - metrics-otel@mappings | ||
| - semconv-resource-to-ecs@mappings | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-60m.otel@custom | ||
| - ecs-tsdb@mappings | ||
| ignore_missing_component_templates: | ||
| - metrics@custom | ||
| - metrics-otel@custom | ||
| - metrics-60m.otel@custom | ||
| template: | ||
| settings: | ||
| index: | ||
| mode: time_series | ||
| mappings: | ||
| properties: | ||
| data_stream.type: | ||
| type: constant_keyword | ||
| value: metrics | ||
| metricset: | ||
| properties: | ||
| interval: | ||
| type: constant_keyword | ||
| value: 60m | ||
| name: | ||
| type: constant_keyword | ||
| value: service_transaction |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Originally I wanted to define
constant_keywordunderresource.attributesformetricset.intervaland underattributesformetricset.name, since that's where these are stored. But that'd again run into the usual issue of wiping out existing mapping forresource.attributes.But as it seems, this works as well - this is also covered by tests.
Just calling out to make sure there is no unwanted implication I may missed.