Skip to content

Commit 8c57341

Browse files
authored
Add .monitoring exemption to DotPrefixValidator (elastic#124158) (elastic#124606)
This was something we were planning on removing, but have not yet. Resolves elastic#124131
1 parent 98f74ca commit 8c57341

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ 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-.*",
78+
"\\.monitoring-logstash-8-.*",
79+
"\\.monitoring-kibana-8-.*",
80+
"\\.monitoring-beats-8-.*",
81+
"\\.monitoring-ent-search-8-.*"
7782
),
7883
(patternList) -> patternList.forEach(pattern -> {
7984
try {

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

Lines changed: 11 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,16 @@ 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>"));
84+
nonOpV.validateIndices(Set.of(".monitoring-logstash-8-thing"));
85+
nonOpV.validateIndices(Set.of("<.monitoring-logstash-8-thing>"));
86+
nonOpV.validateIndices(Set.of(".monitoring-kibana-8-thing"));
87+
nonOpV.validateIndices(Set.of("<.monitoring-kibana-8-thing>"));
88+
nonOpV.validateIndices(Set.of(".monitoring-beats-8-thing"));
89+
nonOpV.validateIndices(Set.of("<.monitoring-beats-8-thing>"));
90+
nonOpV.validateIndices(Set.of(".monitoring-ent-search-8-thing"));
91+
nonOpV.validateIndices(Set.of("<.monitoring-ent-search-8-thing>"));
8292

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

0 commit comments

Comments
 (0)