From 2469dd030a3169b8178e4e3b800f99566ed1e128 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 30 Aug 2021 14:22:51 +0000 Subject: [PATCH] synchronize ecs-logging spec --- utils/ecs-logging/spec.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/utils/ecs-logging/spec.json b/utils/ecs-logging/spec.json index 2c1dfdc..7a5f6be 100644 --- a/utils/ecs-logging/spec.json +++ b/utils/ecs-logging/spec.json @@ -73,22 +73,31 @@ "url": "https://www.elastic.co/guide/en/ecs/current/ecs-service.html", "comment": [ "Configurable by users.", - "When an APM agent is active, they should auto-configure it if not already set." + "When an APM agent is active, it should auto-configure this field if not already set." + ] + }, + "service.node.name": { + "type": "string", + "required": false, + "url": "https://www.elastic.co/guide/en/ecs/current/ecs-service.html", + "comment": [ + "Configurable by users.", + "When an APM agent is active and `service_node_name` is manually configured, the agent should auto-configure this field if not already set." ] }, "event.dataset": { "type": "string", "required": false, "url": "https://www.elastic.co/guide/en/ecs/current/ecs-event.html", - "default": "${service.name}.log OR ${service.name}.${appender.name}", + "default": "${service.name} OR ${service.name}.${appender.name}", "comment": [ "Configurable by users.", "If the user manually configures the service name,", - "the logging library should set `event.dataset=${service.name}.log` if not explicitly configured otherwise.", + "the logging library should set `event.dataset=${service.name}` if not explicitly configured otherwise.", "", "When agents auto-configure the app to use an ECS logger,", "they should set `event.dataset=${service.name}.${appender.name}` if the appender name is available in the logging library.", - "Otherwise, agents should also set `event.dataset=${service.name}.log`", + "Otherwise, agents should also set `event.dataset=${service.name}`", "", "The field helps to filter for different log streams from the same pod, for example and is required for log anomaly detection." ]