Skip to content

[7.x] Add category field to deprecation logs #77550

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 4 commits into from
Oct 18, 2021
Merged

[7.x] Add category field to deprecation logs #77550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8827f3
[7.x] Add category field to deprecation logs
pgomulka Sep 10, 2021
d1518f6
Merge remote-tracking branch 'upstream/7.x' into logging/add_category…
pgomulka Oct 18, 2021
6ccebd9
category fix in test
pgomulka Oct 18, 2021
f30bb42
double comma
pgomulka Oct 18, 2021
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
2 changes: 1 addition & 1 deletion distribution/src/config/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.layout.type = ESJsonLayout
appender.deprecation_rolling.layout.type_name = deprecation.elasticsearch
appender.deprecation_rolling.layout.esmessagefields=x-opaque-id,key
appender.deprecation_rolling.layout.esmessagefields=x-opaque-id,key,category
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
Expand Down
6 changes: 6 additions & 0 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 @@ -150,6 +150,7 @@ public void testParseFieldEmittingDeprecatedLogs() throws Exception {
allOf(
hasEntry("type", "deprecation.elasticsearch"),
hasEntry("level", "CRITICAL"),
hasEntry("category", "api"),
hasEntry("component", "o.e.d.x.ParseField"),
hasEntry("cluster.name", "elasticsearch"),
hasEntry("node.name", "sample-name"),
Expand All @@ -161,6 +162,7 @@ public void testParseFieldEmittingDeprecatedLogs() throws Exception {
allOf(
hasEntry("type", "deprecation.elasticsearch"),
hasEntry("level", "CRITICAL"),
hasEntry("category", "api"),
hasEntry("component", "o.e.d.x.ParseField"),
hasEntry("cluster.name", "elasticsearch"),
hasEntry("node.name", "sample-name"),
Expand Down Expand Up @@ -200,6 +202,7 @@ public void testDeprecatedMessage() throws Exception {
allOf(
hasEntry("type", "deprecation.elasticsearch"),
hasEntry("level", "CRITICAL"),
hasEntry("category", "other"),
hasEntry("component", "o.e.d.test"),
hasEntry("cluster.name", "elasticsearch"),
hasEntry("node.name", "sample-name"),
Expand Down Expand Up @@ -347,6 +350,7 @@ public void testDuplicateLogMessages() throws Exception {
allOf(
hasEntry("type", "deprecation.elasticsearch"),
hasEntry("level", "CRITICAL"),
hasEntry("category", "other"),
hasEntry("component", "o.e.d.test"),
hasEntry("cluster.name", "elasticsearch"),
hasEntry("node.name", "sample-name"),
Expand Down Expand Up @@ -381,6 +385,7 @@ public void testDuplicateLogMessages() throws Exception {
allOf(
hasEntry("type", "deprecation.elasticsearch"),
hasEntry("level", "CRITICAL"),
hasEntry("category", "other"),
hasEntry("component", "o.e.d.test"),
hasEntry("cluster.name", "elasticsearch"),
hasEntry("node.name", "sample-name"),
Expand All @@ -390,6 +395,7 @@ public void testDuplicateLogMessages() throws Exception {
allOf(
hasEntry("type", "deprecation.elasticsearch"),
hasEntry("level", "CRITICAL"),
hasEntry("category", "other"),
hasEntry("component", "o.e.d.test"),
hasEntry("cluster.name", "elasticsearch"),
hasEntry("node.name", "sample-name"),
Expand Down
4 changes: 2 additions & 2 deletions ...-config/src/test/resources/org/elasticsearch/common/logging/json_layout/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ appender.deprecated.name = deprecated
appender.deprecated.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecated.json
appender.deprecated.layout.type = ESJsonLayout
appender.deprecated.layout.type_name = deprecation.elasticsearch
appender.deprecated.layout.esmessagefields = x-opaque-id,key
appender.deprecated.layout.esmessagefields = x-opaque-id,key,category
appender.deprecated.filter.rate_limit.type = RateLimitingFilter

appender.deprecation_rolling_old.type = File
Expand All @@ -28,7 +28,7 @@ appender.deprecatedconsole.type = Console
appender.deprecatedconsole.name = deprecatedconsole
appender.deprecatedconsole.layout.type = ESJsonLayout
appender.deprecatedconsole.layout.type_name = deprecation.elasticsearch
appender.deprecatedconsole.layout.esmessagefields = x-opaque-id,key
appender.deprecatedconsole.layout.esmessagefields = x-opaque-id,key,category
appender.deprecatedconsole.filter.rate_limit.type = RateLimitingFilter

appender.index_search_slowlog_rolling.type = File
Expand Down