Skip to content

Add missing traces ilm policy for OTel traces data streams #119449

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

Merged
merged 4 commits into from
Jan 9, 2025
Merged

Add missing traces ilm policy for OTel traces data streams #119449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
122f455
Add missing traces ilm policy for OTel traces data streams
felixbarny Jan 2, 2025
f80290b
Fix copy/paste error
felixbarny Jan 2, 2025
4e3bee5
Update docs/changelog/119449.yaml
felixbarny Jan 2, 2025
e4bcd9b
Adjust StackTemplateRegistryTests
felixbarny Jan 2, 2025
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 docs/changelog/119449.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 119449
summary: Add missing traces ilm policy for OTel traces data streams
area: Data streams
type: bug
issues: []
1 change: 1 addition & 0 deletions test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,7 @@ protected Set<String> preserveILMPolicyIds() {
"profiling-60-days@lifecycle",
"synthetics",
"synthetics@lifecycle",
"traces@lifecycle",
"7-days-default",
"7-days@lifecycle",
"30-days-default",
Expand Down
17 changes: 17 additions & 0 deletions x-pack/plugin/core/template-resources/src/main/resources/traces@lifecycle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"phases": {
"hot": {
"actions": {
"rollover": {
"max_primary_shard_size": "50gb",
"max_age": "30d"
}
}
}
},
"_meta": {
"description": "default policy for the traces index template installed by x-pack",
"managed": true
},
"deprecated": ${xpack.stack.template.deprecated}
}
3 changes: 3 additions & 0 deletions x-pack/plugin/core/template-resources/src/main/resources/traces@settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"template": {
"settings": {
"index": {
"lifecycle": {
"name": "traces@lifecycle"
},
"codec": "best_compression",
"mapping": {
"ignore_malformed": true
Expand Down
20 changes: 20 additions & 0 deletions x-pack/plugin/otel-data/src/yamlRestTest/resources/rest-api-spec/test/20_traces_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,23 @@ Conflicting attribute types:
- is_true: $datastream-backing-index
- match: { .$datastream-backing-index.settings.index.sort.field.0: "resource.attributes.host.name" }
- match: { .$datastream-backing-index.settings.index.sort.field.1: "@timestamp" }

---
traces@lifecycle:
- do:
bulk:
index: traces-generic.otel-default
refresh: true
body:
- create: {}
- '{"@timestamp":"2024-07-18T14:49:33.467654000Z","data_stream":{"dataset":"generic.otel","namespace":"default"}, "span_id":"1"}'
- is_false: errors
- do:
indices.get_data_stream:
name: traces-generic.otel-default
- set: { data_streams.0.indices.0.index_name: datastream-backing-index }
- do:
indices.get_settings:
index: $datastream-backing-index
- is_true: $datastream-backing-index
- match: { .$datastream-backing-index.settings.index.lifecycle.name: "traces@lifecycle" }
2 changes: 2 additions & 0 deletions x-pack/plugin/stack/src/main/java/org/elasticsearch/xpack/stack/StackTemplateRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public class StackTemplateRegistry extends IndexTemplateRegistry {
//////////////////////////////////////////////////////////
public static final String TRACES_MAPPINGS_COMPONENT_TEMPLATE_NAME = "traces@mappings";
public static final String TRACES_SETTINGS_COMPONENT_TEMPLATE_NAME = "traces@settings";
public static final String TRACES_ILM_POLICY_NAME = "traces@lifecycle";

//////////////////////////////////////////////////////////
// Synthetics components (for matching synthetics-*-* indices)
Expand Down Expand Up @@ -241,6 +242,7 @@ private void updateEnabledSetting(boolean newValue) {
new LifecyclePolicyConfig(LOGS_ILM_POLICY_NAME, "/logs@lifecycle.json", ADDITIONAL_TEMPLATE_VARIABLES),
new LifecyclePolicyConfig(METRICS_ILM_POLICY_NAME, "/metrics@lifecycle.json", ADDITIONAL_TEMPLATE_VARIABLES),
new LifecyclePolicyConfig(SYNTHETICS_ILM_POLICY_NAME, "/synthetics@lifecycle.json", ADDITIONAL_TEMPLATE_VARIABLES),
new LifecyclePolicyConfig(TRACES_ILM_POLICY_NAME, "/traces@lifecycle.json", ADDITIONAL_TEMPLATE_VARIABLES),
new LifecyclePolicyConfig(ILM_7_DAYS_POLICY_NAME, "/7-days@lifecycle.json", ADDITIONAL_TEMPLATE_VARIABLES),
new LifecyclePolicyConfig(ILM_30_DAYS_POLICY_NAME, "/30-days@lifecycle.json", ADDITIONAL_TEMPLATE_VARIABLES),
new LifecyclePolicyConfig(ILM_90_DAYS_POLICY_NAME, "/90-days@lifecycle.json", ADDITIONAL_TEMPLATE_VARIABLES),
Expand Down
7 changes: 4 additions & 3 deletions .../plugin/stack/src/test/java/org/elasticsearch/xpack/stack/StackTemplateRegistryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ public void testThatNonExistingPoliciesAreAddedImmediately() throws Exception {
equalTo(StackTemplateRegistry.LOGS_ILM_POLICY_NAME),
equalTo(StackTemplateRegistry.METRICS_ILM_POLICY_NAME),
equalTo(StackTemplateRegistry.SYNTHETICS_ILM_POLICY_NAME),
equalTo(StackTemplateRegistry.TRACES_ILM_POLICY_NAME),
equalTo(StackTemplateRegistry.ILM_7_DAYS_POLICY_NAME),
equalTo(StackTemplateRegistry.ILM_30_DAYS_POLICY_NAME),
equalTo(StackTemplateRegistry.ILM_90_DAYS_POLICY_NAME),
Expand All @@ -197,7 +198,7 @@ public void testThatNonExistingPoliciesAreAddedImmediately() throws Exception {

ClusterChangedEvent event = createClusterChangedEvent(Collections.emptyMap(), nodes);
registry.clusterChanged(event);
assertBusy(() -> assertThat(calledTimes.get(), equalTo(8)));
assertBusy(() -> assertThat(calledTimes.get(), equalTo(9)));
}

public void testPolicyAlreadyExists() {
Expand All @@ -206,7 +207,7 @@ public void testPolicyAlreadyExists() {

Map<String, LifecyclePolicy> policyMap = new HashMap<>();
List<LifecyclePolicy> policies = registry.getLifecyclePolicies();
assertThat(policies, hasSize(8));
assertThat(policies, hasSize(9));
policies.forEach(p -> policyMap.put(p.getName(), p));

client.setVerifier((action, request, listener) -> {
Expand Down Expand Up @@ -277,7 +278,7 @@ public void testPolicyAlreadyExistsButDiffers() throws IOException {
Map<String, LifecyclePolicy> policyMap = new HashMap<>();
String policyStr = "{\"phases\":{\"delete\":{\"min_age\":\"1m\",\"actions\":{\"delete\":{}}}}}";
List<LifecyclePolicy> policies = registry.getLifecyclePolicies();
assertThat(policies, hasSize(8));
assertThat(policies, hasSize(9));
policies.forEach(p -> policyMap.put(p.getName(), p));

client.setVerifier((action, request, listener) -> {
Expand Down