github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Deprecation dataset value changed to elasticsearch.deprecation (#83254)

Browse source 
The dataset value for all ES logs are prefixed with elasticsearch + log
type. Like elasticsearch.server. Deprecation log had it reverted
deprecation.elasticsearch
This commit renames the dataset for deprecation logs to
`elasticsearch.deprecation.

closes #83251
This commit is contained in:
Przemyslaw Gomulka 2022-06-14 10:42:24 +02:00 • committed by GitHub
parent 590e523db2
commit bb06fac7b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distribution/src/config/log4j2.properties
View file

@ -63,7 +63,7 @@ appender.deprecation_rolling.name = deprecation_rolling
appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.json appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.json
appender.deprecation_rolling.layout.type = ECSJsonLayout appender.deprecation_rolling.layout.type = ECSJsonLayout
# Intentionally follows a different pattern to above # Intentionally follows a different pattern to above
appender.deprecation_rolling.layout.dataset = deprecation.elasticsearch appender.deprecation_rolling.layout.dataset = elasticsearch.deprecation
appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter
appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.json.gz appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.json.gz

6
docs/changelog/83254.yaml Normal file
View file

@ -0,0 +1,6 @@
pr: 83254
summary: Deprecation dataset value changed to `elasticsearch.deprecation`
area: Infra/Logging
type: bug
issues:
- 83251

34
qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java
View file

@ -124,14 +124,14 @@ public class JsonLoggerTests extends ESTestCase {
jsonLogs, jsonLogs,
contains( contains(
allOf( allOf(
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasEntry("log.logger", "org.elasticsearch.deprecation.test"), hasEntry("log.logger", "org.elasticsearch.deprecation.test"),
hasEntry("elasticsearch.cluster.name", "elasticsearch"), hasEntry("elasticsearch.cluster.name", "elasticsearch"),
hasEntry("elasticsearch.node.name", "sample-name"), hasEntry("elasticsearch.node.name", "sample-name"),
hasEntry("message", "deprecated message1"), hasEntry("message", "deprecated message1"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(DeprecatedMessage.KEY_FIELD_NAME, "a key"), hasEntry(DeprecatedMessage.KEY_FIELD_NAME, "a key"),
@ -167,8 +167,8 @@ public class JsonLoggerTests extends ESTestCase {
contains( contains(
allOf( allOf(
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("log.logger", "org.elasticsearch.deprecation.test"), hasEntry("log.logger", "org.elasticsearch.deprecation.test"),
@ -185,8 +185,8 @@ public class JsonLoggerTests extends ESTestCase {
allOf( allOf(
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
// event.dataset and data_stream.dataset have to be the same across the data stream // event.dataset and data_stream.dataset have to be the same across the data stream
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("log.logger", "org.elasticsearch.deprecation.test"), hasEntry("log.logger", "org.elasticsearch.deprecation.test"),
@ -239,8 +239,8 @@ public class JsonLoggerTests extends ESTestCase {
// deprecation log for field deprecated_name // deprecation log for field deprecated_name
allOf( allOf(
hasEntry("log.level", "WARN"), hasEntry("log.level", "WARN"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("log.logger", "org.elasticsearch.deprecation.xcontent.ParseField"), hasEntry("log.logger", "org.elasticsearch.deprecation.xcontent.ParseField"),
@ -257,8 +257,8 @@ public class JsonLoggerTests extends ESTestCase {
// deprecation log for field deprecated_name2 (note it is not being throttled) // deprecation log for field deprecated_name2 (note it is not being throttled)
allOf( allOf(
hasEntry("log.level", "WARN"), hasEntry("log.level", "WARN"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("log.logger", "org.elasticsearch.deprecation.xcontent.ParseField"), hasEntry("log.logger", "org.elasticsearch.deprecation.xcontent.ParseField"),
@ -275,8 +275,8 @@ public class JsonLoggerTests extends ESTestCase {
// compatible log line // compatible log line
allOf( allOf(
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("log.logger", "org.elasticsearch.deprecation.xcontent.ParseField"), hasEntry("log.logger", "org.elasticsearch.deprecation.xcontent.ParseField"),
@ -326,14 +326,14 @@ public class JsonLoggerTests extends ESTestCase {
jsonLogs, jsonLogs,
contains( contains(
allOf( allOf(
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "WARN"), hasEntry("log.level", "WARN"),
hasEntry("log.logger", "org.elasticsearch.deprecation.test"), hasEntry("log.logger", "org.elasticsearch.deprecation.test"),
hasEntry("elasticsearch.cluster.name", "elasticsearch"), hasEntry("elasticsearch.cluster.name", "elasticsearch"),
hasEntry("elasticsearch.node.name", "sample-name"), hasEntry("elasticsearch.node.name", "sample-name"),
hasEntry("message", "deprecated message1"), hasEntry("message", "deprecated message1"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(DeprecatedMessage.KEY_FIELD_NAME, "someKey"), hasEntry(DeprecatedMessage.KEY_FIELD_NAME, "someKey"),
@ -578,7 +578,7 @@ public class JsonLoggerTests extends ESTestCase {
jsonLogs, jsonLogs,
contains( contains(
allOf( allOf(
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasEntry("log.logger", "org.elasticsearch.deprecation.test"), hasEntry("log.logger", "org.elasticsearch.deprecation.test"),
hasEntry("elasticsearch.cluster.name", "elasticsearch"), hasEntry("elasticsearch.cluster.name", "elasticsearch"),
@ -611,7 +611,7 @@ public class JsonLoggerTests extends ESTestCase {
jsonLogs, jsonLogs,
contains( contains(
allOf( allOf(
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasEntry("log.logger", "org.elasticsearch.deprecation.test"), hasEntry("log.logger", "org.elasticsearch.deprecation.test"),
hasEntry("elasticsearch.cluster.name", "elasticsearch"), hasEntry("elasticsearch.cluster.name", "elasticsearch"),
@ -621,7 +621,7 @@ public class JsonLoggerTests extends ESTestCase {
hasEntry("elasticsearch.event.category", "other") hasEntry("elasticsearch.event.category", "other")
), ),
allOf( allOf(
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasEntry("log.logger", "org.elasticsearch.deprecation.test"), hasEntry("log.logger", "org.elasticsearch.deprecation.test"),
hasEntry("elasticsearch.cluster.name", "elasticsearch"), hasEntry("elasticsearch.cluster.name", "elasticsearch"),

4
qa/logging-config/src/test/resources/org/elasticsearch/common/logging/json_layout/log4j2.properties
View file

@ -15,14 +15,14 @@ appender.deprecated.name = deprecated
appender.deprecated.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecated.json appender.deprecated.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecated.json
# Intentionally follows a different pattern to above # Intentionally follows a different pattern to above
appender.deprecated.layout.type = ECSJsonLayout appender.deprecated.layout.type = ECSJsonLayout
appender.deprecated.layout.dataset = deprecation.elasticsearch appender.deprecated.layout.dataset = elasticsearch.deprecation
appender.deprecated.filter.rate_limit.type = RateLimitingFilter appender.deprecated.filter.rate_limit.type = RateLimitingFilter
appender.deprecatedconsole.type = Console appender.deprecatedconsole.type = Console
appender.deprecatedconsole.name = deprecatedconsole appender.deprecatedconsole.name = deprecatedconsole
appender.deprecatedconsole.layout.type = ECSJsonLayout appender.deprecatedconsole.layout.type = ECSJsonLayout
# Intentionally follows a different pattern to above # Intentionally follows a different pattern to above
appender.deprecatedconsole.layout.dataset = deprecation.elasticsearch appender.deprecatedconsole.layout.dataset = elasticsearch.deprecation
appender.deprecatedconsole.filter.rate_limit.type = RateLimitingFilter appender.deprecatedconsole.filter.rate_limit.type = RateLimitingFilter

2
server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java
View file

@ -56,7 +56,7 @@ public class DeprecatedMessage {
String messagePattern, String messagePattern,
Object[] args Object[] args
) { ) {
ESLogMessage esLogMessage = new ESLogMessage(messagePattern, args).field("data_stream.dataset", "deprecation.elasticsearch") ESLogMessage esLogMessage = new ESLogMessage(messagePattern, args).field("data_stream.dataset", "elasticsearch.deprecation")
.field("data_stream.type", "logs") .field("data_stream.type", "logs")
.field("data_stream.namespace", "default") .field("data_stream.namespace", "default")
.field(KEY_FIELD_NAME, key) .field(KEY_FIELD_NAME, key)

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

@ -420,12 +420,12 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasEntry("elasticsearch.event.category", "settings"), hasEntry("elasticsearch.event.category", "settings"),
hasKey("elasticsearch.node.id"), hasKey("elasticsearch.node.id"),
hasKey("elasticsearch.node.name"), hasKey("elasticsearch.node.name"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(KEY_FIELD_NAME, "deprecated_settings"), hasEntry(KEY_FIELD_NAME, "deprecated_settings"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "WARN"), hasEntry("log.level", "WARN"),
hasKey("log.logger"), hasKey("log.logger"),
hasEntry("message", "[deprecated_settings] usage is deprecated. use [settings] instead") hasEntry("message", "[deprecated_settings] usage is deprecated. use [settings] instead")
@ -438,12 +438,12 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasEntry("elasticsearch.event.category", "api"), hasEntry("elasticsearch.event.category", "api"),
hasKey("elasticsearch.node.id"), hasKey("elasticsearch.node.id"),
hasKey("elasticsearch.node.name"), hasKey("elasticsearch.node.name"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(KEY_FIELD_NAME, "deprecated_route_GET_/_test_cluster/deprecated_settings"), hasEntry(KEY_FIELD_NAME, "deprecated_route_GET_/_test_cluster/deprecated_settings"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "WARN"), hasEntry("log.level", "WARN"),
hasKey("log.logger"), hasKey("log.logger"),
hasEntry("message", "[/_test_cluster/deprecated_settings] exists for deprecated tests") hasEntry("message", "[/_test_cluster/deprecated_settings] exists for deprecated tests")
@ -490,12 +490,12 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasEntry("elasticsearch.event.category", "settings"), hasEntry("elasticsearch.event.category", "settings"),
hasKey("elasticsearch.node.id"), hasKey("elasticsearch.node.id"),
hasKey("elasticsearch.node.name"), hasKey("elasticsearch.node.name"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(KEY_FIELD_NAME, "deprecated_critical_settings"), hasEntry(KEY_FIELD_NAME, "deprecated_critical_settings"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasKey("log.logger"), hasKey("log.logger"),
hasEntry("message", "[deprecated_settings] usage is deprecated. use [settings] instead") hasEntry("message", "[deprecated_settings] usage is deprecated. use [settings] instead")
@ -542,12 +542,12 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasEntry("elasticsearch.event.category", "settings"), hasEntry("elasticsearch.event.category", "settings"),
hasKey("elasticsearch.node.id"), hasKey("elasticsearch.node.id"),
hasKey("elasticsearch.node.name"), hasKey("elasticsearch.node.name"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(KEY_FIELD_NAME, "deprecated_warn_settings"), hasEntry(KEY_FIELD_NAME, "deprecated_warn_settings"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "WARN"), hasEntry("log.level", "WARN"),
hasKey("log.logger"), hasKey("log.logger"),
hasEntry("message", "[deprecated_warn_settings] usage is deprecated but won't be breaking in next version") hasEntry("message", "[deprecated_warn_settings] usage is deprecated but won't be breaking in next version")
@ -560,12 +560,12 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasEntry("elasticsearch.event.category", "api"), hasEntry("elasticsearch.event.category", "api"),
hasKey("elasticsearch.node.id"), hasKey("elasticsearch.node.id"),
hasKey("elasticsearch.node.name"), hasKey("elasticsearch.node.name"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(KEY_FIELD_NAME, "deprecated_route_GET_/_test_cluster/deprecated_settings"), hasEntry(KEY_FIELD_NAME, "deprecated_route_GET_/_test_cluster/deprecated_settings"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "WARN"), hasEntry("log.level", "WARN"),
hasKey("log.logger"), hasKey("log.logger"),
hasEntry("message", "[/_test_cluster/deprecated_settings] exists for deprecated tests") hasEntry("message", "[/_test_cluster/deprecated_settings] exists for deprecated tests")
@ -624,12 +624,12 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasEntry("elasticsearch.event.category", "compatible_api"), hasEntry("elasticsearch.event.category", "compatible_api"),
hasKey("elasticsearch.node.id"), hasKey("elasticsearch.node.id"),
hasKey("elasticsearch.node.name"), hasKey("elasticsearch.node.name"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(KEY_FIELD_NAME, "compatible_key"), hasEntry(KEY_FIELD_NAME, "compatible_key"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasKey("log.logger"), hasKey("log.logger"),
hasEntry("message", "You are using a compatible API for this request") hasEntry("message", "You are using a compatible API for this request")
@ -642,12 +642,12 @@ public class DeprecationHttpIT extends ESRestTestCase {
hasEntry("elasticsearch.event.category", "compatible_api"), hasEntry("elasticsearch.event.category", "compatible_api"),
hasKey("elasticsearch.node.id"), hasKey("elasticsearch.node.id"),
hasKey("elasticsearch.node.name"), hasKey("elasticsearch.node.name"),
hasEntry("data_stream.dataset", "deprecation.elasticsearch"), hasEntry("data_stream.dataset", "elasticsearch.deprecation"),
hasEntry("data_stream.namespace", "default"), hasEntry("data_stream.namespace", "default"),
hasEntry("data_stream.type", "logs"), hasEntry("data_stream.type", "logs"),
hasKey("ecs.version"), hasKey("ecs.version"),
hasEntry(KEY_FIELD_NAME, "deprecated_route_GET_/_test_cluster/compat_only"), hasEntry(KEY_FIELD_NAME, "deprecated_route_GET_/_test_cluster/compat_only"),
hasEntry("event.dataset", "deprecation.elasticsearch"), hasEntry("event.dataset", "elasticsearch.deprecation"),
hasEntry("log.level", "CRITICAL"), hasEntry("log.level", "CRITICAL"),
hasKey("log.logger"), hasKey("log.logger"),
hasEntry("message", "[/_test_cluster/deprecated_settings] exists for deprecated tests") hasEntry("message", "[/_test_cluster/deprecated_settings] exists for deprecated tests")

2
x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/logging/DeprecationIndexingComponent.java
View file

@ -75,7 +75,7 @@ public class DeprecationIndexingComponent extends AbstractLifecycleComponent imp
final Configuration configuration = context.getConfiguration(); final Configuration configuration = context.getConfiguration();
final EcsLayout ecsLayout = ECSJsonLayout.newBuilder() final EcsLayout ecsLayout = ECSJsonLayout.newBuilder()
.setDataset("deprecation.elasticsearch") .setDataset("elasticsearch.deprecation")
.setConfiguration(configuration) .setConfiguration(configuration)
.build(); .build();