Skip to content

[Sampling] update sampling config get all response to fit elastic standards #137290

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
seanzatzdev merged 1 commit into from
Oct 28, 2025
Merged

[Sampling] update sampling config get all response to fit elastic standards #137290

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
66 changes: 33 additions & 33 deletions ...mlRestTest/resources/rest-api-spec/test/indices.get_all_sample_configuration/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ teardown:
indices.get_all_sample_configuration: {}

# Should return an empty array
- length: { $body: 0 }
- length: { configurations: 0 }

---
"Get all sampling configurations with single configuration":
Expand All @@ -49,12 +49,12 @@ teardown:
indices.get_all_sample_configuration:
human: true

- length: { $body: 1 }
- match: { 0.index: "test-single-config-index" }
- match: { 0.configuration.rate: 0.5 }
- match: { 0.configuration.max_samples: 100 }
- match: { 0.configuration.max_size: "10mb" }
- match: { 0.configuration.time_to_live: "1h" }
- length: { configurations: 1 }
- match: { configurations.0.index: "test-single-config-index" }
- match: { configurations.0.configuration.rate: 0.5 }
- match: { configurations.0.configuration.max_samples: 100 }
- match: { configurations.0.configuration.max_size: "10mb" }
- match: { configurations.0.configuration.time_to_live: "1h" }

---
"Get all sampling configurations with multiple configurations":
Expand Down Expand Up @@ -102,14 +102,14 @@ teardown:
indices.get_all_sample_configuration:
human: true

- length: { $body: 3 }
- length: { configurations: 3 }
# Note: Array order may vary, so we just verify all 3 configurations exist
- is_true: 0.index
- is_true: 0.configuration
- is_true: 1.index
- is_true: 1.configuration
- is_true: 2.index
- is_true: 2.configuration
- is_true: configurations.0.index
- is_true: configurations.0.configuration
- is_true: configurations.1.index
- is_true: configurations.1.configuration
- is_true: configurations.2.index
- is_true: configurations.2.configuration

---
"Get all sampling configurations with mixed indices":
Expand Down Expand Up @@ -148,11 +148,11 @@ teardown:
human: true

# Should only return configured indices (2 items)
- length: { $body: 2 }
- is_true: 0.index
- is_true: 0.configuration
- is_true: 1.index
- is_true: 1.configuration
- length: { configurations: 2 }
- is_true: configurations.0.index
- is_true: configurations.0.configuration
- is_true: configurations.1.index
- is_true: configurations.1.configuration

---
"Get all sampling configurations after update":
Expand All @@ -174,10 +174,10 @@ teardown:
indices.get_all_sample_configuration:
human: true

- length: { $body: 1 }
- match: { 0.index: "test-update-all-index" }
- match: { 0.configuration.rate: 0.2 }
- match: { 0.configuration.max_samples: 30 }
- length: { configurations: 1 }
- match: { configurations.0.index: "test-update-all-index" }
- match: { configurations.0.configuration.rate: 0.2 }
- match: { configurations.0.configuration.max_samples: 30 }

# Update configuration
- do:
Expand All @@ -195,11 +195,11 @@ teardown:
indices.get_all_sample_configuration:
human: true

- length: { $body: 1 }
- match: { 0.index: "test-update-all-index" }
- match: { 0.configuration.rate: 0.9 }
- match: { 0.configuration.max_samples: 150 }
- match: { 0.configuration.max_size: "15mb" }
- length: { configurations: 1 }
- match: { configurations.0.index: "test-update-all-index" }
- match: { configurations.0.configuration.rate: 0.9 }
- match: { configurations.0.configuration.max_samples: 150 }
- match: { configurations.0.configuration.max_size: "15mb" }

---
"Get all sampling configurations after deletion":
Expand Down Expand Up @@ -234,7 +234,7 @@ teardown:
indices.get_all_sample_configuration:
human: true

- length: { $body: 2 }
- length: { configurations: 2 }

# Delete one configuration
- do:
Expand All @@ -248,7 +248,7 @@ teardown:
indices.get_all_sample_configuration:
human: true

- length: { $body: 1 }
- match: { 0.index: "test-delete-all-index-2" }
- match: { 0.configuration.rate: 0.8 }
- match: { 0.configuration.max_samples: 200 }
- length: { configurations: 1 }
- match: { configurations.0.index: "test-delete-all-index-2" }
- match: { configurations.0.configuration.rate: 0.8 }
- match: { configurations.0.configuration.max_samples: 200 }
3 changes: 2 additions & 1 deletion ...java/org/elasticsearch/action/admin/indices/sampling/GetAllSampleConfigurationAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,15 @@ public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params
}

private XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
builder.startArray();
builder.startObject().startArray("configurations");
for (Map.Entry<String, SamplingConfiguration> entry : indexToSamplingConfigMap.entrySet()) {
builder.startObject();
builder.field("index", entry.getKey());
builder.field("configuration", entry.getValue());
builder.endObject();
}
builder.endArray();
builder.endObject();
return builder;
}
}
Expand Down