Tweak the ECS fields in DeprecatedMessage (#62855)

Backport of #62855. Follow-up to #61484.
elastic · Sep 24, 2020 · 7771d8b · 7771d8b
1 parent 71b92f8
commit 7771d8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.../qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java b/.../qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
@@ -277,8 +277,8 @@ public void testDeprecationMessagesCanBeIndexed() throws Exception {
                             hasKey("cluster.name"),
                             hasKey("cluster.uuid"),
                             hasKey("component"),
-                            hasEntry("data_stream.datatype", "deprecation"),
-                            hasEntry("data_stream.namespace", "elasticsearch"),
+                            hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
+                            hasEntry("data_stream.namespace", "default"),
                             hasEntry("data_stream.type", "logs"),
                             hasEntry("ecs.version", "1.6"),
                             hasEntry("key", "deprecated_settings"),
@@ -293,8 +293,8 @@ public void testDeprecationMessagesCanBeIndexed() throws Exception {
                             hasKey("cluster.name"),
                             hasKey("cluster.uuid"),
                             hasKey("component"),
-                            hasEntry("data_stream.datatype", "deprecation"),
-                            hasEntry("data_stream.namespace", "elasticsearch"),
+                            hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
+                            hasEntry("data_stream.namespace", "default"),
                             hasEntry("data_stream.type", "logs"),
                             hasEntry("ecs.version", "1.6"),
                             hasEntry("key", "deprecated_route"),

diff --git a/.../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/logging/EcsJsonLayout.java b/.../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/logging/EcsJsonLayout.java
@@ -58,8 +58,8 @@ protected String pattern(String type, String[] esMessageFields) {
         map.put("node.name", inQuotes("%node_name"));
         map.put("message", inQuotes("%notEmpty{%enc{%marker}{JSON} }%enc{%.-10000m}{JSON}"));
         map.put("data_stream.type", inQuotes("logs"));
-        map.put("data_stream.datatype", inQuotes("deprecation"));
-        map.put("data_stream.namespace", inQuotes("elasticsearch"));
+        map.put("data_stream.dataset", inQuotes("deprecation.elasticsearch"));
+        map.put("data_stream.namespace", inQuotes("default"));
         map.put("ecs.version", inQuotes(ECS_VERSION));
 
         for (String key : esMessageFields) {