Skip to content

Commit eb73a02

Browse files
author
David Roberts
committed
Adjustments to account for review comment changes to elastic#32788 
1 parent 2222e5f commit eb73a02

File tree

6 files changed

+65
-65
lines changed

6 files changed

+65
-65
lines changed

‎x-pack/plugin/ml/log-config-creator/src/main/java/org/elasticsearch/xpack/ml/configcreator/LogConfigCreator.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.elasticsearch.cli.UserException;
1414
import org.elasticsearch.common.io.PathUtils;
1515
import org.elasticsearch.grok.Grok;
16-
import org.elasticsearch.xpack.ml.logstructure.LogFileStructure;
17-
import org.elasticsearch.xpack.ml.logstructure.LogFileStructureFinder;
18-
import org.elasticsearch.xpack.ml.logstructure.LogFileStructureFinderManager;
16+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructure;
17+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructureFinder;
18+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructureFinderManager;
1919
import org.joda.time.DateTimeZone;
2020

2121
import java.io.IOException;
@@ -158,9 +158,9 @@ protected void execute(Terminal terminal, OptionSet options) throws Exception {
158158
try {
159159
LogConfigWriter logConfigWriter = new LogConfigWriter(terminal, filebeatModulePath,
160160
file.toAbsolutePath().normalize().toString(), indexName, typeName, elasticsearchHost, logstashHost, timezone);
161-
LogFileStructureFinderManager structureFinderManager = new LogFileStructureFinderManager();
162-
LogFileStructureFinder structureFinder = structureFinderManager.findLogFileStructure(sampleLines, Files.newInputStream(file));
163-
LogFileStructure structure = structureFinder.getStructure();
161+
LogStructureFinderManager structureFinderManager = new LogStructureFinderManager();
162+
LogStructureFinder structureFinder = structureFinderManager.findLogStructure(sampleLines, Files.newInputStream(file));
163+
LogStructure structure = structureFinder.getStructure();
164164
for (String reason : structure.getExplanation()) {
165165
terminal.println(Verbosity.VERBOSE, reason);
166166
}

‎x-pack/plugin/ml/log-config-creator/src/main/java/org/elasticsearch/xpack/ml/configcreator/LogConfigWriter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import com.fasterxml.jackson.databind.ObjectMapper;
99
import org.elasticsearch.cli.Terminal;
10-
import org.elasticsearch.xpack.ml.logstructure.AbstractLogFileStructureFinder;
11-
import org.elasticsearch.xpack.ml.logstructure.LogFileStructure;
10+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructure;
11+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructureUtils;
1212

1313
import java.io.IOException;
1414
import java.nio.charset.StandardCharsets;
@@ -400,7 +400,7 @@ public LogConfigWriter(Terminal terminal, Path filebeatModulePath, String sample
400400
this.logstashFileTimezone = logstashFileTimezone;
401401
}
402402

403-
void createPreambleComment(LogFileStructure structure) {
403+
void createPreambleComment(LogStructure structure) {
404404
String preamble = structure.getSampleStart();
405405
int lineCount = structure.getNumLinesAnalyzed();
406406
int messageCount = structure.getNumMessagesAnalyzed();
@@ -466,7 +466,7 @@ private void writeMappingsConfigs(Path directory, SortedMap<String, Object> fiel
466466

467467
terminal.println(Terminal.Verbosity.VERBOSE, "---");
468468

469-
Map<String, Object> properties = Collections.singletonMap(AbstractLogFileStructureFinder.MAPPING_PROPERTIES_SETTING, fieldTypes);
469+
Map<String, Object> properties = Collections.singletonMap(LogStructureUtils.MAPPING_PROPERTIES_SETTING, fieldTypes);
470470
Map<String, Object> docType = Collections.singletonMap("_doc", properties);
471471
Map<String, Object> mappings = Collections.singletonMap("mappings", docType);
472472

@@ -493,7 +493,7 @@ static String makeColumnConversions(Map<String, Object> mappings) {
493493
}
494494

495495
String convertTo = null;
496-
switch (settings.get(AbstractLogFileStructureFinder.MAPPING_TYPE_SETTING)){
496+
switch (settings.get(LogStructureUtils.MAPPING_TYPE_SETTING)){
497497

498498
case "boolean":
499499
convertTo = "boolean";
@@ -561,7 +561,7 @@ private String makeLogstashFileCodec(String multilineRegex, String charsetName)
561561
multilineRegexQuote);
562562
}
563563

564-
private void createJsonConfigs(LogFileStructure structure) {
564+
private void createJsonConfigs(LogStructure structure) {
565565

566566
String logstashFromFilebeatDateFilter = "";
567567
String logstashFromFileDateFilter = "";
@@ -590,11 +590,11 @@ private void createJsonConfigs(LogFileStructure structure) {
590590
ingestPipelineDateProcessor);
591591
}
592592

593-
private void createXmlConfigs(LogFileStructure structure) {
593+
private void createXmlConfigs(LogStructure structure) {
594594

595595
assert structure.getMappings().isEmpty() == false;
596596
String topLevelTag = structure.getMappings().keySet().stream()
597-
.filter(k -> AbstractLogFileStructureFinder.DEFAULT_TIMESTAMP_FIELD.equals(k) == false).findFirst().get();
597+
.filter(k -> LogStructureUtils.DEFAULT_TIMESTAMP_FIELD.equals(k) == false).findFirst().get();
598598

599599
String logstashFromFilebeatDateFilter = "";
600600
String logstashFromFileDateFilter = "";
@@ -616,7 +616,7 @@ private void createXmlConfigs(LogFileStructure structure) {
616616
elasticsearchHost, indexName);
617617
}
618618

619-
private void createSeparatedValuesConfigs(LogFileStructure structure) {
619+
private void createSeparatedValuesConfigs(LogStructure structure) {
620620

621621
char delimiter = structure.getSeparator();
622622
String logstashFromFilebeatDateFilter = "";
@@ -645,7 +645,7 @@ private void createSeparatedValuesConfigs(LogFileStructure structure) {
645645
skipHeaderIfRequired, logstashColumnConversions, logstashStripFilter, logstashFromFileDateFilter, elasticsearchHost, indexName);
646646
}
647647

648-
private void createTextConfigs(LogFileStructure structure, List<String> sampleMessages) {
648+
private void createTextConfigs(LogStructure structure, List<String> sampleMessages) {
649649

650650
String grokPattern = structure.getGrokPattern();
651651
String grokQuote = bestLogstashQuoteFor(grokPattern);
@@ -686,7 +686,7 @@ private void createTextConfigs(LogFileStructure structure, List<String> sampleMe
686686
}
687687
}
688688

689-
void createConfigs(LogFileStructure structure, List<String> sampleMessages) {
689+
void createConfigs(LogStructure structure, List<String> sampleMessages) {
690690

691691
switch (structure.getFormat()) {
692692
case JSON:
@@ -707,7 +707,7 @@ void createConfigs(LogFileStructure structure, List<String> sampleMessages) {
707707
}
708708
}
709709

710-
public synchronized void writeConfigs(LogFileStructure structure, List<String> sampleMessages, Path directory) throws IOException {
710+
public synchronized void writeConfigs(LogStructure structure, List<String> sampleMessages, Path directory) throws IOException {
711711

712712
createConfigs(structure, sampleMessages);
713713
createPreambleComment(structure);

‎x-pack/plugin/ml/log-config-creator/src/test/java/org/elasticsearch/xpack/ml/configcreator/LogConfigCreatorTestCase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
import org.elasticsearch.cli.Terminal;
99
import org.elasticsearch.cli.Terminal.Verbosity;
10-
import org.elasticsearch.xpack.ml.logstructure.LogFileStructureTestCase;
10+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructureTestCase;
1111

1212
import java.util.Arrays;
1313
import java.util.List;
1414

15-
public abstract class LogConfigCreatorTestCase extends LogFileStructureTestCase {
15+
public abstract class LogConfigCreatorTestCase extends LogStructureTestCase {
1616

1717
protected static final List<String> REDUCED_CHARSETS = Arrays.asList("UTF-8", "UTF-16BE", "UTF-16LE");
1818
protected static final List<String> POSSIBLE_TIMEZONES = Arrays.asList(null, "Europe/London", "UTC", "+05:30", "-08:00", "EST");

‎x-pack/plugin/ml/log-config-creator/src/test/java/org/elasticsearch/xpack/ml/configcreator/LogConfigCreatorTests.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package org.elasticsearch.xpack.ml.configcreator;
77

8-
import org.elasticsearch.xpack.ml.logstructure.LogFileStructureFinder;
9-
import org.elasticsearch.xpack.ml.logstructure.LogFileStructureFinderManager;
8+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructureFinder;
9+
import org.elasticsearch.xpack.ml.logstructurefinder.LogStructureFinderManager;
1010
import org.junit.Before;
1111

1212
import java.io.ByteArrayInputStream;
@@ -30,12 +30,12 @@ public class LogConfigCreatorTests extends LogConfigCreatorTestCase {
3030
private static final String INDEX_MAPPINGS_CONSOLE = TEST_TYPE + "-index-mappings.console";
3131
private static final String INDEX_MAPPINGS_SH = TEST_TYPE + "-index-mappings.sh";
3232

33-
private LogFileStructureFinderManager structureFinderManager;
33+
private LogStructureFinderManager structureFinderManager;
3434
private LogConfigWriter logConfigWriter;
3535

3636
@Before
3737
public void setup() throws IOException {
38-
structureFinderManager = new LogFileStructureFinderManager();
38+
structureFinderManager = new LogStructureFinderManager();
3939
logConfigWriter = new LogConfigWriter(TEST_TERMINAL, null, TEST_FILE_NAME, TEST_INDEX_NAME, TEST_TYPE,
4040
randomFrom(POSSIBLE_HOSTNAMES), randomFrom(POSSIBLE_HOSTNAMES), "UTC");
4141
}
@@ -44,8 +44,8 @@ public void testFindLogFileFormatGivenJson() throws Exception {
4444
Path outputDirectory = createTempDir();
4545

4646
try (ByteArrayInputStream inputStream = new ByteArrayInputStream(JSON_SAMPLE.getBytes(StandardCharsets.UTF_8))) {
47-
LogFileStructureFinder logFileStructureFinder =
48-
structureFinderManager.findLogFileStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
47+
LogStructureFinder logFileStructureFinder =
48+
structureFinderManager.findLogStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
4949
logConfigWriter.writeConfigs(logFileStructureFinder.getStructure(), logFileStructureFinder.getSampleMessages(),
5050
outputDirectory);
5151
}
@@ -64,8 +64,8 @@ public void testFindLogFileFormatGivenXml() throws Exception {
6464
Path outputDirectory = createTempDir();
6565

6666
try (ByteArrayInputStream inputStream = new ByteArrayInputStream(XML_SAMPLE.getBytes(StandardCharsets.UTF_8))) {
67-
LogFileStructureFinder logFileStructureFinder =
68-
structureFinderManager.findLogFileStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
67+
LogStructureFinder logFileStructureFinder =
68+
structureFinderManager.findLogStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
6969
logConfigWriter.writeConfigs(logFileStructureFinder.getStructure(), logFileStructureFinder.getSampleMessages(),
7070
outputDirectory);
7171
}
@@ -84,8 +84,8 @@ public void testFindLogFileFormatGivenCsv() throws Exception {
8484
Path outputDirectory = createTempDir();
8585

8686
try (ByteArrayInputStream inputStream = new ByteArrayInputStream(CSV_SAMPLE.getBytes(StandardCharsets.UTF_8))) {
87-
LogFileStructureFinder logFileStructureFinder =
88-
structureFinderManager.findLogFileStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
87+
LogStructureFinder logFileStructureFinder =
88+
structureFinderManager.findLogStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
8989
logConfigWriter.writeConfigs(logFileStructureFinder.getStructure(), logFileStructureFinder.getSampleMessages(),
9090
outputDirectory);
9191
}
@@ -104,8 +104,8 @@ public void testFindLogFileFormatGivenTsv() throws Exception {
104104
Path outputDirectory = createTempDir();
105105

106106
try (ByteArrayInputStream inputStream = new ByteArrayInputStream(TSV_SAMPLE.getBytes(StandardCharsets.UTF_8))) {
107-
LogFileStructureFinder logFileStructureFinder =
108-
structureFinderManager.findLogFileStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
107+
LogStructureFinder logFileStructureFinder =
108+
structureFinderManager.findLogStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
109109
logConfigWriter.writeConfigs(logFileStructureFinder.getStructure(), logFileStructureFinder.getSampleMessages(),
110110
outputDirectory);
111111
}
@@ -124,8 +124,8 @@ public void testFindLogFileFormatGivenText() throws Exception {
124124
Path outputDirectory = createTempDir();
125125

126126
try (ByteArrayInputStream inputStream = new ByteArrayInputStream(TEXT_SAMPLE.getBytes(StandardCharsets.UTF_8))) {
127-
LogFileStructureFinder logFileStructureFinder =
128-
structureFinderManager.findLogFileStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
127+
LogStructureFinder logFileStructureFinder =
128+
structureFinderManager.findLogStructure(explanation, IDEAL_SAMPLE_LINE_COUNT, inputStream);
129129
logConfigWriter.writeConfigs(logFileStructureFinder.getStructure(), logFileStructureFinder.getSampleMessages(),
130130
outputDirectory);
131131
}

0 commit comments

Comments
 (0)