mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-03-25 01:19:02 +00:00
Fix name of the log appender. (#445)
This commit fixes some name issues leftover from the rename to OpenSearch work. With this commit, the `gradlew :run` task should work. Signed-off-by: Rabi Panda <pandarab@amazon.com>
This commit is contained in:
Rabi Panda
GitHub
parent
0d02b203fb
commit
f50865913e
@ -2,7 +2,7 @@ status = error
|
||||
|
||||
appender.rolling.type = Console
|
||||
appender.rolling.name = rolling
|
||||
appender.rolling.layout.type = ESJsonLayout
|
||||
appender.rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.rolling.layout.type_name = server
|
||||
|
||||
rootLogger.level = info
|
||||
@ -10,7 +10,7 @@ rootLogger.appenderRef.rolling.ref = rolling
|
||||
|
||||
appender.deprecation_rolling.type = Console
|
||||
appender.deprecation_rolling.name = deprecation_rolling
|
||||
appender.deprecation_rolling.layout.type = ESJsonLayout
|
||||
appender.deprecation_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.deprecation_rolling.layout.type_name = deprecation
|
||||
appender.deprecation_rolling.layout.opensearchmessagefields=x-opaque-id
|
||||
appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter
|
||||
@ -26,7 +26,7 @@ logger.deprecation.additivity = false
|
||||
|
||||
appender.index_search_slowlog_rolling.type = Console
|
||||
appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
|
||||
appender.index_search_slowlog_rolling.layout.type = ESJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type_name = index_search_slowlog
|
||||
appender.index_search_slowlog_rolling.layout.opensearchmessagefields=message,took,took_millis,total_hits,stats,search_type,total_shards,source,id
|
||||
|
||||
@ -37,7 +37,7 @@ logger.index_search_slowlog_rolling.additivity = false
|
||||
|
||||
appender.index_indexing_slowlog_rolling.type = Console
|
||||
appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
|
||||
appender.index_indexing_slowlog_rolling.layout.type = ESJsonLayout
|
||||
appender.index_indexing_slowlog_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.index_indexing_slowlog_rolling.layout.type_name = index_indexing_slowlog
|
||||
appender.index_indexing_slowlog_rolling.layout.opensearchmessagefields=message,took,took_millis,doc_type,id,routing,source
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ status = error
|
||||
|
||||
appender.rolling.type = Console
|
||||
appender.rolling.name = rolling
|
||||
appender.rolling.layout.type = ESJsonLayout
|
||||
appender.rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.rolling.layout.type_name = server
|
||||
|
||||
rootLogger.level = info
|
||||
@ -13,7 +13,7 @@ appender.header_warning.name = header_warning
|
||||
|
||||
appender.deprecation_rolling.type = Console
|
||||
appender.deprecation_rolling.name = deprecation_rolling
|
||||
appender.deprecation_rolling.layout.type = ESJsonLayout
|
||||
appender.deprecation_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.deprecation_rolling.layout.type_name = deprecation
|
||||
appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter
|
||||
|
||||
@ -25,7 +25,7 @@ logger.deprecation.additivity = false
|
||||
|
||||
appender.index_search_slowlog_rolling.type = Console
|
||||
appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
|
||||
appender.index_search_slowlog_rolling.layout.type = ESJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type_name = index_search_slowlog
|
||||
|
||||
logger.index_search_slowlog_rolling.name = index.search.slowlog
|
||||
@ -35,7 +35,7 @@ logger.index_search_slowlog_rolling.additivity = false
|
||||
|
||||
appender.index_indexing_slowlog_rolling.type = Console
|
||||
appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
|
||||
appender.index_indexing_slowlog_rolling.layout.type = ESJsonLayout
|
||||
appender.index_indexing_slowlog_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.index_indexing_slowlog_rolling.layout.type_name = index_indexing_slowlog
|
||||
|
||||
logger.index_indexing_slowlog.name = index.indexing.slowlog.index
|
||||
|
||||
@ -9,7 +9,7 @@ appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%ma
|
||||
appender.rolling.type = RollingFile
|
||||
appender.rolling.name = rolling
|
||||
appender.rolling.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs.cluster_name}_server.json
|
||||
appender.rolling.layout.type = ESJsonLayout
|
||||
appender.rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.rolling.layout.type_name = server
|
||||
|
||||
appender.rolling.filePattern = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs.cluster_name}-%d{yyyy-MM-dd}-%i.json.gz
|
||||
@ -61,7 +61,7 @@ rootLogger.appenderRef.rolling_old.ref = rolling_old
|
||||
appender.deprecation_rolling.type = RollingFile
|
||||
appender.deprecation_rolling.name = deprecation_rolling
|
||||
appender.deprecation_rolling.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs.cluster_name}_deprecation.json
|
||||
appender.deprecation_rolling.layout.type = ESJsonLayout
|
||||
appender.deprecation_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.deprecation_rolling.layout.type_name = deprecation
|
||||
appender.deprecation_rolling.layout.opensearchmessagefields=x-opaque-id
|
||||
appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter
|
||||
@ -103,7 +103,7 @@ appender.index_search_slowlog_rolling.type = RollingFile
|
||||
appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
|
||||
appender.index_search_slowlog_rolling.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs\
|
||||
.cluster_name}_index_search_slowlog.json
|
||||
appender.index_search_slowlog_rolling.layout.type = ESJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type_name = index_search_slowlog
|
||||
appender.index_search_slowlog_rolling.layout.opensearchmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id
|
||||
|
||||
@ -142,7 +142,7 @@ appender.index_indexing_slowlog_rolling.type = RollingFile
|
||||
appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
|
||||
appender.index_indexing_slowlog_rolling.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs.cluster_name}\
|
||||
_index_indexing_slowlog.json
|
||||
appender.index_indexing_slowlog_rolling.layout.type = ESJsonLayout
|
||||
appender.index_indexing_slowlog_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.index_indexing_slowlog_rolling.layout.type_name = index_indexing_slowlog
|
||||
appender.index_indexing_slowlog_rolling.layout.opensearchmessagefields=message,took,took_millis,doc_type,id,routing,source
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@ public class OpenSearchJsonLayoutTests extends OpenSearchTestCase {
|
||||
public void testLayoutWithAdditionalFields() {
|
||||
OpenSearchJsonLayout server = OpenSearchJsonLayout.newBuilder()
|
||||
.setType("server")
|
||||
.setESMessageFields("x-opaque-id,someOtherField")
|
||||
.setOpenSearchMessageFields("x-opaque-id,someOtherField")
|
||||
.build();
|
||||
String conversionPattern = server.getPatternLayout().getConversionPattern();
|
||||
|
||||
@ -69,8 +69,8 @@ public class OpenSearchJsonLayoutTests extends OpenSearchTestCase {
|
||||
"\"cluster.name\": \"${sys:opensearch.logs.cluster_name}\", " +
|
||||
"\"node.name\": \"%node_name\", " +
|
||||
"\"message\": \"%notEmpty{%enc{%marker}{JSON} }%enc{%.-10000m}{JSON}\"" +
|
||||
"%notEmpty{, \"x-opaque-id\": \"%ESMessageField{x-opaque-id}\"}" +
|
||||
"%notEmpty{, \"someOtherField\": \"%ESMessageField{someOtherField}\"}" +
|
||||
"%notEmpty{, \"x-opaque-id\": \"%OpenSearchMessageField{x-opaque-id}\"}" +
|
||||
"%notEmpty{, \"someOtherField\": \"%OpenSearchMessageField{someOtherField}\"}" +
|
||||
"%notEmpty{, %node_and_cluster_id }" +
|
||||
"%exceptionAsJson }" + System.lineSeparator()));
|
||||
}
|
||||
@ -78,7 +78,7 @@ public class OpenSearchJsonLayoutTests extends OpenSearchTestCase {
|
||||
public void testLayoutWithAdditionalFieldOverride() {
|
||||
OpenSearchJsonLayout server = OpenSearchJsonLayout.newBuilder()
|
||||
.setType("server")
|
||||
.setESMessageFields("message")
|
||||
.setOpenSearchMessageFields("message")
|
||||
.build();
|
||||
String conversionPattern = server.getPatternLayout().getConversionPattern();
|
||||
|
||||
@ -90,7 +90,7 @@ public class OpenSearchJsonLayoutTests extends OpenSearchTestCase {
|
||||
"\"component\": \"%c{1.}\", " +
|
||||
"\"cluster.name\": \"${sys:opensearch.logs.cluster_name}\", " +
|
||||
"\"node.name\": \"%node_name\"" +
|
||||
"%notEmpty{, \"message\": \"%ESMessageField{message}\"}" +
|
||||
"%notEmpty{, \"message\": \"%OpenSearchMessageField{message}\"}" +
|
||||
"%notEmpty{, %node_and_cluster_id }" +
|
||||
"%exceptionAsJson }" + System.lineSeparator()));
|
||||
}
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
appender.console.type = Console
|
||||
appender.console.name = console
|
||||
appender.console.layout.type = ESJsonLayout
|
||||
appender.console.layout.type = OpenSearchJsonLayout
|
||||
appender.console.layout.type_name = console
|
||||
|
||||
appender.file.type = File
|
||||
appender.file.name = file
|
||||
appender.file.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs.cluster_name}.log
|
||||
appender.file.layout.type = ESJsonLayout
|
||||
appender.file.layout.type = OpenSearchJsonLayout
|
||||
appender.file.layout.type_name = file
|
||||
|
||||
appender.deprecated.type = File
|
||||
appender.deprecated.name = deprecated
|
||||
appender.deprecated.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs.cluster_name}_deprecated.json
|
||||
appender.deprecated.layout.type = ESJsonLayout
|
||||
appender.deprecated.layout.type = OpenSearchJsonLayout
|
||||
appender.deprecated.layout.type_name = deprecation
|
||||
appender.deprecated.layout.esmessagefields = x-opaque-id
|
||||
appender.deprecated.filter.rate_limit.type = RateLimitingFilter
|
||||
|
||||
appender.deprecatedconsole.type = Console
|
||||
appender.deprecatedconsole.name = deprecatedconsole
|
||||
appender.deprecatedconsole.layout.type = ESJsonLayout
|
||||
appender.deprecatedconsole.layout.type = OpenSearchJsonLayout
|
||||
appender.deprecatedconsole.layout.type_name = deprecation
|
||||
appender.deprecatedconsole.layout.esmessagefields = x-opaque-id
|
||||
appender.deprecatedconsole.filter.rate_limit.type = RateLimitingFilter
|
||||
@ -28,7 +28,7 @@ appender.index_search_slowlog_rolling.type = File
|
||||
appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
|
||||
appender.index_search_slowlog_rolling.fileName = ${sys:opensearch.logs.base_path}${sys:file.separator}${sys:opensearch.logs\
|
||||
.cluster_name}_index_search_slowlog.json
|
||||
appender.index_search_slowlog_rolling.layout.type = ESJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type = OpenSearchJsonLayout
|
||||
appender.index_search_slowlog_rolling.layout.type_name = index_search_slowlog
|
||||
appender.index_search_slowlog_rolling.layout.esmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id
|
||||
|
||||
|
||||
@ -60,13 +60,13 @@ import java.util.stream.Stream;
|
||||
* Taken from JsonThrowablePatternConverter</li>
|
||||
* </ul>
|
||||
* <p>
|
||||
* It is possible to add more or override them with <code>esmessagefield</code>
|
||||
* <code>appender.logger.layout.esmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id</code>
|
||||
* It is possible to add more or override them with <code>opensearchmessagefield</code>
|
||||
* <code>appender.logger.layout.opensearchmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id</code>
|
||||
* Each of these will be expanded into a json field with a value taken {@link OpenSearchLogMessage} field. In the example above
|
||||
* <code>... "message": %ESMessageField{message}, "took": %ESMessageField{took} ...</code>
|
||||
* the message passed to a logger will be overriden with a value from %ESMessageField{message}
|
||||
* <code>... "message": %OpenSearchMessageField{message}, "took": %OpenSearchMessageField{took} ...</code>
|
||||
* the message passed to a logger will be overriden with a value from %OpenSearchMessageField{message}
|
||||
* <p>
|
||||
* The value taken from %ESMessageField{message} has to be a simple escaped JSON value and is populated in subclasses of
|
||||
* The value taken from %OpenSearchMessageField{message} has to be a simple escaped JSON value and is populated in subclasses of
|
||||
* <code>OpenSearchLogMessage</code>
|
||||
*/
|
||||
@Plugin(name = "OpenSearchJsonLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
|
||||
@ -82,7 +82,7 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
|
||||
.build();
|
||||
}
|
||||
|
||||
private String pattern(String type, String[] esMessageFields) {
|
||||
private String pattern(String type, String[] opensearchMessageFields) {
|
||||
if (Strings.isEmpty(type)) {
|
||||
throw new IllegalArgumentException("layout parameter 'type_name' cannot be empty");
|
||||
}
|
||||
@ -95,20 +95,20 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
|
||||
map.put("node.name", inQuotes("%node_name"));
|
||||
map.put("message", inQuotes("%notEmpty{%enc{%marker}{JSON} }%enc{%.-10000m}{JSON}"));
|
||||
|
||||
for (String key : esMessageFields) {
|
||||
map.put(key, inQuotes("%ESMessageField{" + key + "}"));
|
||||
for (String key : opensearchMessageFields) {
|
||||
map.put(key, inQuotes("%opensearchMessageField{" + key + "}"));
|
||||
}
|
||||
return createPattern(map, Stream.of(esMessageFields).collect(Collectors.toSet()));
|
||||
return createPattern(map, Stream.of(opensearchMessageFields).collect(Collectors.toSet()));
|
||||
}
|
||||
|
||||
|
||||
private String createPattern(Map<String, Object> map, Set<String> esMessageFields) {
|
||||
private String createPattern(Map<String, Object> map, Set<String> opensearchMessageFields) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("{");
|
||||
String separator = "";
|
||||
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||
|
||||
if (esMessageFields.contains(entry.getKey())) {
|
||||
if (opensearchMessageFields.contains(entry.getKey())) {
|
||||
sb.append("%notEmpty{");
|
||||
sb.append(separator);
|
||||
appendField(sb, entry);
|
||||
@ -148,8 +148,8 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
|
||||
@PluginFactory
|
||||
public static OpenSearchJsonLayout createLayout(String type,
|
||||
Charset charset,
|
||||
String[] esmessagefields) {
|
||||
return new OpenSearchJsonLayout(type, charset, esmessagefields);
|
||||
String[] opensearchmessagefields) {
|
||||
return new OpenSearchJsonLayout(type, charset, opensearchmessagefields);
|
||||
}
|
||||
|
||||
PatternLayout getPatternLayout() {
|
||||
@ -165,8 +165,8 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
|
||||
@PluginAttribute(value = "charset", defaultString = "UTF-8")
|
||||
Charset charset;
|
||||
|
||||
@PluginAttribute("esmessagefields")
|
||||
private String esMessageFields;
|
||||
@PluginAttribute("opensearchmessagefields")
|
||||
private String opensearchMessageFields;
|
||||
|
||||
public Builder() {
|
||||
setCharset(StandardCharsets.UTF_8);
|
||||
@ -174,7 +174,7 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
|
||||
|
||||
@Override
|
||||
public OpenSearchJsonLayout build() {
|
||||
String[] split = Strings.isNullOrEmpty(esMessageFields) ? new String[]{} : esMessageFields.split(",");
|
||||
String[] split = Strings.isNullOrEmpty(opensearchMessageFields) ? new String[]{} : opensearchMessageFields.split(",");
|
||||
return OpenSearchJsonLayout.createLayout(type, charset, split);
|
||||
}
|
||||
|
||||
@ -196,12 +196,12 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
|
||||
return asBuilder();
|
||||
}
|
||||
|
||||
public String getESMessageFields() {
|
||||
return esMessageFields;
|
||||
public String getOpenSearchMessageFields() {
|
||||
return opensearchMessageFields;
|
||||
}
|
||||
|
||||
public B setESMessageFields(String esmessagefields) {
|
||||
this.esMessageFields = esmessagefields;
|
||||
public B setOpenSearchMessageFields(String opensearchMessageFields) {
|
||||
this.opensearchMessageFields = opensearchMessageFields;
|
||||
return asBuilder();
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ import org.apache.logging.log4j.util.StringBuilders;
|
||||
import org.opensearch.common.Strings;
|
||||
|
||||
/**
|
||||
* Pattern converter to populate ESMessageField in a pattern.
|
||||
* Pattern converter to populate OpenSearchMessageField in a pattern.
|
||||
* It will only populate these if the event have message of type <code>OpenSearchLogMessage</code>.
|
||||
*/
|
||||
@Plugin(category = PatternConverter.CATEGORY, name = "OpenSearchMessageField")
|
||||
@ -48,7 +48,7 @@ public final class OpenSearchMessageFieldConverter extends LogEventPatternConver
|
||||
}
|
||||
|
||||
public OpenSearchMessageFieldConverter(String key) {
|
||||
super("ESMessageField", "ESMessageField");
|
||||
super("OpenSearchMessageField", "OpenSearchMessageField");
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user