diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index fd1556ca0ced..b1f7ecdce125 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -112,3 +112,4 @@ - Log output of container to $LOGS_PATH/elastic-agent-start.log when LOGS_PATH set {pull}25150[25150] - Use `filestream` input for internal log collection. {pull}25660[25660] - Enable agent to send custom headers to kibana/ES {pull}26275[26275] +- Set `agent.id` to the Fleet Agent ID in events published from inputs backed by Beats. {issue}21121[21121] {pull}26394[26394] diff --git a/x-pack/elastic-agent/pkg/agent/program/supported.go b/x-pack/elastic-agent/pkg/agent/program/supported.go index 9ff4eab7f10a..3d34d953e670 100644 --- a/x-pack/elastic-agent/pkg/agent/program/supported.go +++ b/x-pack/elastic-agent/pkg/agent/program/supported.go @@ -25,7 +25,7 @@ func init() { // spec/metricbeat.yml // spec/osquerybeat.yml // spec/packetbeat.yml - unpacked := packer.MustUnpack("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") + unpacked := packer.MustUnpack("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") SupportedMap = make(map[string]Spec) for f, v := range unpacked { diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_output_true-filebeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_output_true-filebeat.yml index 82a47adc999b..42029b454a41 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_output_true-filebeat.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_output_true-filebeat.yml @@ -22,6 +22,10 @@ filebeat: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: "agent" + fields: + id: agent-id output: elasticsearch: enabled: true diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_true-filebeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_true-filebeat.yml index 1406a2dff65b..6a3cab074ea4 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_true-filebeat.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/enabled_true-filebeat.yml @@ -23,6 +23,10 @@ filebeat: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: "agent" + fields: + id: agent-id output: elasticsearch: hosts: diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-filebeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-filebeat.yml index 524d6451f281..1294b44bb490 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-filebeat.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-filebeat.yml @@ -24,6 +24,10 @@ filebeat: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: "agent" + fields: + id: agent-id - type: log paths: - /var/log/hello3.log @@ -48,6 +52,10 @@ filebeat: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: "agent" + fields: + id: agent-id output: elasticsearch: hosts: diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-heartbeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-heartbeat.yml index 76bad6aeeb74..a397f3a90df8 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-heartbeat.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-heartbeat.yml @@ -7,6 +7,17 @@ inputs: timeout: 16s wait: 1s data_stream.namespace: default + processors: + - add_fields: + target: 'elastic_agent' + fields: + id: agent-id + version: 8.0.0 + snapshot: false + - add_fields: + target: 'agent' + fields: + id: agent-id output: elasticsearch: hosts: diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-metricbeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-metricbeat.yml index 2889e7605eb2..b56834faacc3 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-metricbeat.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-metricbeat.yml @@ -21,6 +21,10 @@ metricbeat: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: "agent" + fields: + id: agent-id - module: docker metricsets: [info] index: metrics-generic-default @@ -42,6 +46,10 @@ metricbeat: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: "agent" + fields: + id: agent-id - module: apache metricsets: [info] index: metrics-generic-testing @@ -66,6 +74,10 @@ metricbeat: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: "agent" + fields: + id: agent-id output: elasticsearch: hosts: [127.0.0.1:9200, 127.0.0.1:9300] diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-packetbeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-packetbeat.yml index f451ad93ddbd..879ed127a0ca 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-packetbeat.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-packetbeat.yml @@ -7,6 +7,10 @@ inputs: id: agent-id version: 8.0.0 snapshot: false + - add_fields: + target: 'agent' + fields: + id: agent-id streams: - type: flow timeout: 10s diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/synthetics_config-heartbeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/synthetics_config-heartbeat.yml index c9af2356e120..284d391f78b8 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/synthetics_config-heartbeat.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/synthetics_config-heartbeat.yml @@ -7,6 +7,17 @@ inputs: timeout: 16s wait: 1s data_stream.namespace: default + processors: + - add_fields: + target: 'elastic_agent' + fields: + id: agent-id + version: 8.0.0 + snapshot: false + - add_fields: + target: 'agent' + fields: + id: agent-id - type: synthetics/tcp id: unique-tcp-id name: my-tcp @@ -15,6 +26,17 @@ inputs: timeout: 16s wait: 1s data_stream.namespace: default + processors: + - add_fields: + target: 'elastic_agent' + fields: + id: agent-id + version: 8.0.0 + snapshot: false + - add_fields: + target: 'agent' + fields: + id: agent-id - type: synthetics/icmp id: unique-icmp-id name: my-icmp @@ -26,6 +48,17 @@ inputs: timeout: 16s wait: 1s data_stream.namespace: default + processors: + - add_fields: + target: 'elastic_agent' + fields: + id: agent-id + version: 8.0.0 + snapshot: false + - add_fields: + target: 'agent' + fields: + id: agent-id output: elasticsearch: hosts: [127.0.0.1:9200, 127.0.0.1:9300] diff --git a/x-pack/elastic-agent/pkg/agent/transpiler/rules.go b/x-pack/elastic-agent/pkg/agent/transpiler/rules.go index 2afb312c9303..b09477c169f8 100644 --- a/x-pack/elastic-agent/pkg/agent/transpiler/rules.go +++ b/x-pack/elastic-agent/pkg/agent/transpiler/rules.go @@ -775,7 +775,7 @@ func (r *InjectAgentInfoRule) Apply(agentInfo AgentInfo, ast *AST) (err error) { return errors.New("InjectAgentInfoRule: processors is not a list") } - // elastic.agent + // elastic_agent processorMap := &Dict{value: make([]Node, 0)} processorMap.value = append(processorMap.value, &Key{name: "target", value: &StrVal{value: "elastic_agent"}}) processorMap.value = append(processorMap.value, &Key{name: "fields", value: &Dict{value: []Node{ @@ -785,6 +785,15 @@ func (r *InjectAgentInfoRule) Apply(agentInfo AgentInfo, ast *AST) (err error) { }}}) addFieldsMap := &Dict{value: []Node{&Key{"add_fields", processorMap}}} processorsList.value = mergeStrategy("").InjectItem(processorsList.value, addFieldsMap) + + // agent.id + processorMap = &Dict{value: make([]Node, 0)} + processorMap.value = append(processorMap.value, &Key{name: "target", value: &StrVal{value: "agent"}}) + processorMap.value = append(processorMap.value, &Key{name: "fields", value: &Dict{value: []Node{ + &Key{name: "id", value: &StrVal{value: agentInfo.AgentID()}}, + }}}) + addFieldsMap = &Dict{value: []Node{&Key{"add_fields", processorMap}}} + processorsList.value = mergeStrategy("").InjectItem(processorsList.value, addFieldsMap) } return nil diff --git a/x-pack/elastic-agent/pkg/agent/transpiler/rules_test.go b/x-pack/elastic-agent/pkg/agent/transpiler/rules_test.go index 71e12ac444bd..ad551822cf37 100644 --- a/x-pack/elastic-agent/pkg/agent/transpiler/rules_test.go +++ b/x-pack/elastic-agent/pkg/agent/transpiler/rules_test.go @@ -189,6 +189,10 @@ inputs: id: agent-id snapshot: false version: 8.0.0 + - add_fields: + target: agent + fields: + id: agent-id - name: With processors type: file processors: @@ -202,6 +206,10 @@ inputs: id: agent-id snapshot: false version: 8.0.0 + - add_fields: + target: agent + fields: + id: agent-id `, rule: &RuleList{ Rules: []Rule{ diff --git a/x-pack/elastic-agent/spec/heartbeat.yml b/x-pack/elastic-agent/spec/heartbeat.yml index adb0c414f106..ecb373cf7912 100644 --- a/x-pack/elastic-agent/spec/heartbeat.yml +++ b/x-pack/elastic-agent/spec/heartbeat.yml @@ -14,6 +14,7 @@ rules: key: enabled values: - true + - inject_agent_info: {} - filter: selectors: - inputs