Skip to content

Commit 9097158

Browse files
committed
Add .monitoring exemption to DotPrefixValidator
This was something we were planning on removing, but have not yet. Resolves #124131
1 parent d7b8b72 commit 9097158

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

modules/dot-prefix-validation/src/main/java/org/elasticsearch/validation/DotPrefixValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public abstract class DotPrefixValidator<RequestType> implements MappedActionFil
7373
"\\.ml-state-\\d+",
7474
"\\.slo-observability\\.sli-v\\d+.*",
7575
"\\.slo-observability\\.summary-v\\d+.*",
76-
"\\.entities\\.v\\d+\\.latest\\..*"
76+
"\\.entities\\.v\\d+\\.latest\\..*",
77+
"\\.monitoring-es-8-.*"
7778
),
7879
(patternList) -> patternList.forEach(pattern -> {
7980
try {

modules/dot-prefix-validation/src/test/java/org/elasticsearch/validation/DotPrefixValidatorTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testValidation() {
6767

6868
// Test ignored patterns
6969
nonOpV.validateIndices(Set.of(".ml-state-21309"));
70-
nonOpV.validateIndices(Set.of(">.ml-state-21309>"));
70+
nonOpV.validateIndices(Set.of("<.ml-state-21309>"));
7171
nonOpV.validateIndices(Set.of(".slo-observability.sli-v2"));
7272
nonOpV.validateIndices(Set.of(".slo-observability.sli-v2.3"));
7373
nonOpV.validateIndices(Set.of(".slo-observability.sli-v2.3-2024-01-01"));
@@ -79,6 +79,8 @@ public void testValidation() {
7979
nonOpV.validateIndices(Set.of(".entities.v1.latest.builtin_services_from_ecs_data"));
8080
nonOpV.validateIndices(Set.of(".entities.v92.latest.eggplant.potato"));
8181
nonOpV.validateIndices(Set.of("<.entities.v12.latest.eggplant-{M{yyyy-MM-dd|UTC}}>"));
82+
nonOpV.validateIndices(Set.of(".monitoring-es-8-thing"));
83+
nonOpV.validateIndices(Set.of("<.monitoring-es-8-thing>"));
8284

8385
// Test pattern added to the settings
8486
nonOpV.validateIndices(Set.of(".potato5"));

0 commit comments

Comments
 (0)