Skip to content

Tweak the ECS fields in DeprecatedMessage #62855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2020
Merged

Tweak the ECS fields in DeprecatedMessage #62855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ public void testDeprecatedMessageWithoutXOpaqueId() throws IOException {
hasEntry("node.name", "sample-name"),
hasEntry("message", "deprecated message1"),
hasEntry("data_stream.type", "logs"),
hasEntry("data_stream.datatype", "deprecation"),
hasEntry("data_stream.namespace", "elasticsearch"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
hasEntry("data_stream.namespace", "default"),
hasEntry("ecs.version", DeprecatedMessage.ECS_VERSION),
hasEntry("key", "a key"),
not(hasKey("x-opaque-id"))
Expand Down Expand Up @@ -145,8 +145,8 @@ public void testDeprecatedMessage() throws Exception {
hasEntry("node.name", "sample-name"),
hasEntry("message", "deprecated message1"),
hasEntry("data_stream.type", "logs"),
hasEntry("data_stream.datatype", "deprecation"),
hasEntry("data_stream.namespace", "elasticsearch"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
hasEntry("data_stream.namespace", "default"),
hasEntry("ecs.version", DeprecatedMessage.ECS_VERSION),
hasEntry("key", "someKey"),
hasEntry("x-opaque-id", "someId")
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public class DeprecatedMessage {
public static ESLogMessage of(String key, String xOpaqueId, String messagePattern, Object... args) {
ESLogMessage esLogMessage = new ESLogMessage(messagePattern, args)
.field("data_stream.type", "logs")
.field("data_stream.datatype", "deprecation")
.field("data_stream.namespace", "elasticsearch")
.field("data_stream.dataset", "deprecation.elasticsearch")
.field("data_stream.namespace", "default")
.field("ecs.version", ECS_VERSION)
.field("key", key);

Expand Down
8 changes: 4 additions & 4 deletions .../qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ public void testDeprecationMessagesCanBeIndexed() throws Exception {
hasKey("cluster.name"),
hasKey("cluster.uuid"),
hasKey("log.logger"),
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"),
Expand All @@ -291,8 +291,8 @@ public void testDeprecationMessagesCanBeIndexed() throws Exception {
hasKey("cluster.name"),
hasKey("cluster.uuid"),
hasKey("log.logger"),
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"),
Expand Down