honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweak the ECS fields in DeprecatedMessage (#62855) 

Backport of #62855. Follow-up to #61484.
This commit is contained in:
Rory Hunter 2020-09-24 11:58:53 +01:00 committed by Rory Hunter
parent 71b92f8699
commit 7771d8b6fa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
View File

@ -277,8 +277,8 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasKey("cluster.name"), hasKey("cluster.name"),
hasKey("cluster.uuid"), hasKey("cluster.uuid"),
hasKey("component"), hasKey("component"),
hasEntry("data_stream.datatype", "deprecation"), hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
hasEntry("data_stream.namespace", "elasticsearch"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("ecs.version", "1.6"), hasEntry("ecs.version", "1.6"),
hasEntry("key", "deprecated_settings"), hasEntry("key", "deprecated_settings"),
@ -293,8 +293,8 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasKey("cluster.name"), hasKey("cluster.name"),
hasKey("cluster.uuid"), hasKey("cluster.uuid"),
hasKey("component"), hasKey("component"),
hasEntry("data_stream.datatype", "deprecation"), hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
hasEntry("data_stream.namespace", "elasticsearch"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("ecs.version", "1.6"), hasEntry("ecs.version", "1.6"),
hasEntry("key", "deprecated_route"), hasEntry("key", "deprecated_route"),

4
x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/logging/EcsJsonLayout.java
View File

@ -58,8 +58,8 @@ public class EcsJsonLayout extends AbstractStringLayout {
map.put("node.name", inQuotes("%node_name")); map.put("node.name", inQuotes("%node_name"));
map.put("message", inQuotes("%notEmpty{%enc{%marker}{JSON} }%enc{%.-10000m}{JSON}")); map.put("message", inQuotes("%notEmpty{%enc{%marker}{JSON} }%enc{%.-10000m}{JSON}"));
map.put("data_stream.type", inQuotes("logs")); map.put("data_stream.type", inQuotes("logs"));
map.put("data_stream.datatype", inQuotes("deprecation")); map.put("data_stream.dataset", inQuotes("deprecation.elasticsearch"));
map.put("data_stream.namespace", inQuotes("elasticsearch")); map.put("data_stream.namespace", inQuotes("default"));
map.put("ecs.version", inQuotes(ECS_VERSION)); map.put("ecs.version", inQuotes(ECS_VERSION));
for (String key : esMessageFields) { for (String key : esMessageFields) {