Skip to content

Commit 6cd3d3f

Browse files
github-actions[bot]dzane17
authored andcommitted
Remove local index custom name setting (#166)
Signed-off-by: David Zane <davizane@amazon.com> (cherry picked from commit a97099c) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 9730e66 commit 6cd3d3f

File tree

6 files changed

+4
-92
lines changed

6 files changed

+4
-92
lines changed

src/main/java/org/opensearch/plugin/insights/core/exporter/QueryInsightsExporterFactory.java

-17
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88

99
package org.opensearch.plugin.insights.core.exporter;
1010

11-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.DEFAULT_TOP_N_QUERIES_INDEX_PATTERN;
1211
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.DEFAULT_TOP_QUERIES_EXPORTER_TYPE;
1312
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORTER_TYPE;
14-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORT_INDEX;
1513

1614
import java.io.IOException;
1715
import java.util.HashSet;
@@ -71,21 +69,6 @@ public void validateExporterConfig(final Settings settings) throws IllegalArgume
7169
)
7270
);
7371
}
74-
switch (type) {
75-
case LOCAL_INDEX:
76-
final String indexPattern = settings.get(EXPORT_INDEX, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN);
77-
if (indexPattern.length() == 0) {
78-
throw new IllegalArgumentException("Empty index pattern configured for the exporter");
79-
}
80-
try {
81-
DateTimeFormat.forPattern(indexPattern);
82-
} catch (Exception e) {
83-
OperationalMetricsCounter.getInstance().incrementCounter(OperationalMetric.INVALID_INDEX_PATTERN_EXCEPTIONS);
84-
throw new IllegalArgumentException(
85-
String.format(Locale.ROOT, "Invalid index pattern [%s] configured for the exporter", indexPattern)
86-
);
87-
}
88-
}
8972
}
9073

9174
/**

src/main/java/org/opensearch/plugin/insights/core/reader/QueryInsightsReaderFactory.java

-28
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,14 @@
88

99
package org.opensearch.plugin.insights.core.reader;
1010

11-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.DEFAULT_TOP_N_QUERIES_INDEX_PATTERN;
12-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORT_INDEX;
13-
1411
import java.io.IOException;
1512
import java.util.HashSet;
16-
import java.util.Locale;
1713
import java.util.Set;
1814
import org.apache.logging.log4j.LogManager;
1915
import org.apache.logging.log4j.Logger;
2016
import org.joda.time.format.DateTimeFormat;
2117
import org.opensearch.client.Client;
22-
import org.opensearch.common.settings.Settings;
2318
import org.opensearch.core.xcontent.NamedXContentRegistry;
24-
import org.opensearch.plugin.insights.core.metrics.OperationalMetric;
25-
import org.opensearch.plugin.insights.core.metrics.OperationalMetricsCounter;
2619

2720
/**
2821
* Factory class for validating and creating Readers based on provided settings
@@ -45,27 +38,6 @@ public QueryInsightsReaderFactory(final Client client) {
4538
this.Readers = new HashSet<>();
4639
}
4740

48-
/**
49-
* Validate Reader sink config
50-
*
51-
* @param settings Reader sink config {@link Settings}
52-
* @throws IllegalArgumentException if provided Reader sink config settings are invalid
53-
*/
54-
public void validateReaderConfig(final Settings settings) throws IllegalArgumentException {
55-
final String indexPattern = settings.get(EXPORT_INDEX, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN);
56-
if (indexPattern.isEmpty()) {
57-
throw new IllegalArgumentException("Empty index pattern configured for the Reader");
58-
}
59-
try {
60-
DateTimeFormat.forPattern(indexPattern);
61-
} catch (Exception e) {
62-
OperationalMetricsCounter.getInstance().incrementCounter(OperationalMetric.INVALID_INDEX_PATTERN_EXCEPTIONS);
63-
throw new IllegalArgumentException(
64-
String.format(Locale.ROOT, "Invalid index pattern [%s] configured for the Reader", indexPattern)
65-
);
66-
}
67-
}
68-
6941
/**
7042
* Create a Reader based on provided parameters
7143
*

src/main/java/org/opensearch/plugin/insights/core/service/TopQueriesService.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.DEFAULT_TOP_N_QUERIES_INDEX_PATTERN;
1212
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.DEFAULT_TOP_QUERIES_EXPORTER_TYPE;
1313
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORTER_TYPE;
14-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORT_INDEX;
1514
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.QUERY_INSIGHTS_EXECUTOR;
1615

1716
import java.io.IOException;
@@ -262,7 +261,7 @@ public void setExporter(final Settings settings) {
262261
if (settings.get(EXPORTER_TYPE) != null) {
263262
SinkType expectedType = SinkType.parse(settings.get(EXPORTER_TYPE, DEFAULT_TOP_QUERIES_EXPORTER_TYPE));
264263
if (exporter != null && expectedType == SinkType.getSinkTypeFromExporter(exporter)) {
265-
queryInsightsExporterFactory.updateExporter(exporter, settings.get(EXPORT_INDEX, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN));
264+
queryInsightsExporterFactory.updateExporter(exporter, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN);
266265
} else {
267266
try {
268267
queryInsightsExporterFactory.closeExporter(this.exporter);
@@ -272,7 +271,7 @@ public void setExporter(final Settings settings) {
272271
}
273272
this.exporter = queryInsightsExporterFactory.createExporter(
274273
SinkType.parse(settings.get(EXPORTER_TYPE, DEFAULT_TOP_QUERIES_EXPORTER_TYPE)),
275-
settings.get(EXPORT_INDEX, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN)
274+
DEFAULT_TOP_N_QUERIES_INDEX_PATTERN
276275
);
277276
}
278277
} else {
@@ -294,11 +293,8 @@ public void setExporter(final Settings settings) {
294293
* @param namedXContentRegistry NamedXContentRegistry for parsing purposes
295294
*/
296295
public void setReader(final Settings settings, final NamedXContentRegistry namedXContentRegistry) {
297-
this.reader = queryInsightsReaderFactory.createReader(
298-
settings.get(EXPORT_INDEX, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN),
299-
namedXContentRegistry
300-
);
301-
queryInsightsReaderFactory.updateReader(reader, settings.get(EXPORT_INDEX, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN));
296+
this.reader = queryInsightsReaderFactory.createReader(DEFAULT_TOP_N_QUERIES_INDEX_PATTERN, namedXContentRegistry);
297+
queryInsightsReaderFactory.updateReader(reader, DEFAULT_TOP_N_QUERIES_INDEX_PATTERN);
302298
}
303299

304300
/**
@@ -308,7 +304,6 @@ public void setReader(final Settings settings, final NamedXContentRegistry named
308304
*/
309305
public void validateExporterAndReaderConfig(Settings settings) {
310306
queryInsightsExporterFactory.validateExporterConfig(settings);
311-
queryInsightsReaderFactory.validateReaderConfig(settings);
312307
}
313308

314309
/**

src/main/java/org/opensearch/plugin/insights/settings/QueryInsightsSettings.java

-4
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,6 @@ public class QueryInsightsSettings {
219219
* Config key for exporter type
220220
*/
221221
public static final String EXPORTER_TYPE = "type";
222-
/**
223-
* Config key for export index
224-
*/
225-
public static final String EXPORT_INDEX = "config.index";
226222
/**
227223
* Settings and defaults for top queries exporters
228224
*/

src/test/java/org/opensearch/plugin/insights/core/exporter/QueryInsightsExporterFactoryTests.java

-16
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
import static org.mockito.ArgumentMatchers.any;
1212
import static org.mockito.Mockito.mock;
1313
import static org.mockito.Mockito.when;
14-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.DEFAULT_TOP_QUERIES_EXPORTER_TYPE;
1514
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORTER_TYPE;
16-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORT_INDEX;
1715

1816
import org.joda.time.format.DateTimeFormat;
1917
import org.junit.Before;
@@ -61,20 +59,6 @@ public void testInvalidExporterTypeConfig() {
6159
assertThrows(IllegalArgumentException.class, () -> { queryInsightsExporterFactory.validateExporterConfig(settings); });
6260
}
6361

64-
public void testInvalidLocalIndexConfig() {
65-
Settings.Builder settingsBuilder = Settings.builder();
66-
assertThrows(IllegalArgumentException.class, () -> {
67-
queryInsightsExporterFactory.validateExporterConfig(
68-
settingsBuilder.put(EXPORTER_TYPE, DEFAULT_TOP_QUERIES_EXPORTER_TYPE).put(EXPORT_INDEX, "").build()
69-
);
70-
});
71-
assertThrows(IllegalArgumentException.class, () -> {
72-
queryInsightsExporterFactory.validateExporterConfig(
73-
settingsBuilder.put(EXPORTER_TYPE, DEFAULT_TOP_QUERIES_EXPORTER_TYPE).put(EXPORT_INDEX, "some_invalid_pattern").build()
74-
);
75-
});
76-
}
77-
7862
public void testCreateAndCloseExporter() {
7963
QueryInsightsExporter exporter1 = queryInsightsExporterFactory.createExporter(SinkType.LOCAL_INDEX, format);
8064
assertTrue(exporter1 instanceof LocalIndexExporter);

src/test/java/org/opensearch/plugin/insights/core/reader/QueryInsightsReaderFactoryTests.java

-18
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
import static org.mockito.Mockito.mock;
1313
import static org.mockito.Mockito.when;
1414
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.DEFAULT_TOP_N_QUERIES_INDEX_PATTERN;
15-
import static org.opensearch.plugin.insights.settings.QueryInsightsSettings.EXPORT_INDEX;
1615

1716
import org.joda.time.format.DateTimeFormat;
1817
import org.junit.Before;
1918
import org.opensearch.client.Client;
20-
import org.opensearch.common.settings.Settings;
2119
import org.opensearch.core.xcontent.NamedXContentRegistry;
2220
import org.opensearch.plugin.insights.core.metrics.OperationalMetricsCounter;
2321
import org.opensearch.telemetry.metrics.Counter;
@@ -45,22 +43,6 @@ public void setup() {
4543
OperationalMetricsCounter.initialize("cluster", metricsRegistry);
4644
}
4745

48-
public void testValidateConfigWhenResetReader() {
49-
Settings.Builder settingsBuilder = Settings.builder();
50-
Settings settings = settingsBuilder.build();
51-
try {
52-
queryInsightsReaderFactory.validateReaderConfig(settings);
53-
} catch (Exception e) {
54-
fail("No exception should be thrown when setting is null");
55-
}
56-
}
57-
58-
public void testInvalidReaderTypeConfig() {
59-
Settings.Builder settingsBuilder = Settings.builder();
60-
Settings settings = settingsBuilder.put(EXPORT_INDEX, "some_invalid_type").build();
61-
assertThrows(IllegalArgumentException.class, () -> { queryInsightsReaderFactory.validateReaderConfig(settings); });
62-
}
63-
6446
public void testCreateAndCloseReader() {
6547
QueryInsightsReader reader1 = queryInsightsReaderFactory.createReader(format, namedXContentRegistry);
6648
assertTrue(reader1 instanceof LocalIndexReader);

0 commit comments

Comments
 (0)