Skip to content

Commit 78b957a

Browse files
authored
Remove agent.hostname field from libbeat (#18328)
agent.hostname is not part of ECS so this removes the field. Instead the agent.name field can be used for this purpose and it it part of ECS. This adds an alias pointing from agent.hostname to agent.name. Closes #16377
1 parent b696540 commit 78b957a

File tree

36 files changed

+122
-71
lines changed

36 files changed

+122
-71
lines changed

CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
1515
- Change aws_elb autodiscover provider field name from elb_listener.* to aws.elb.*. {issue}16219[16219] {pull}16402{16402}
1616
- Remove `AddDockerMetadata` and `AddKubernetesMetadata` processors from the `script` processor. They can still be used as normal processors in the configuration. {issue}16349[16349] {pull}16514[16514]
1717
- Introduce APM libbeat instrumentation, active when running the beat with ELASTIC_APM_ACTIVE=true. {pull}17938[17938]
18+
- Remove the non-ECS `agent.hostname` field. Use the `agent.name` or `agent.id` fields for an identifier. {issue}16377[16377] {pull}18328[18328]
1819

1920
*Auditbeat*
2021

auditbeat/docs/fields.asciidoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,10 +2458,12 @@ Contains common beat fields available in all event types.
24582458
*`agent.hostname`*::
24592459
+
24602460
--
2461-
Deprecated - use agent.name or agent.id to identify an agent. Hostname of the agent.
2461+
Deprecated - use agent.name or agent.id to identify an agent.
24622462
24632463
2464-
type: keyword
2464+
type: alias
2465+
2466+
alias to: agent.name
24652467
24662468
--
24672469
@@ -2498,7 +2500,7 @@ alias to: host.name
24982500
--
24992501
type: alias
25002502
2501-
alias to: agent.hostname
2503+
alias to: agent.name
25022504
25032505
--
25042506

auditbeat/include/fields.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-executions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
{
165165
"attributes": {
166166
"columns": [
167-
"agent.hostname",
167+
"agent.name",
168168
"process.args",
169169
"auditd.summary.actor.primary",
170170
"auditd.summary.actor.secondary",

auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-overview.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
{
147147
"attributes": {
148148
"columns": [
149-
"agent.hostname",
149+
"agent.name",
150150
"auditd.summary.actor.primary",
151151
"auditd.summary.actor.secondary",
152152
"event.action",

auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-sockets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
{
452452
"attributes": {
453453
"columns": [
454-
"agent.hostname",
454+
"agent.name",
455455
"auditd.summary.how",
456456
"auditd.summary.object.primary",
457457
"auditd.summary.object.secondary",
@@ -566,7 +566,7 @@
566566
{
567567
"attributes": {
568568
"columns": [
569-
"agent.hostname",
569+
"agent.name",
570570
"auditd.summary.how",
571571
"auditd.summary.object.primary",
572572
"auditd.summary.object.secondary",
@@ -673,7 +673,7 @@
673673
{
674674
"attributes": {
675675
"columns": [
676-
"agent.hostname",
676+
"agent.name",
677677
"auditd.summary.how",
678678
"auditd.summary.object.primary",
679679
"auditd.summary.object.secondary",

filebeat/docs/fields.asciidoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3113,10 +3113,12 @@ Contains common beat fields available in all event types.
31133113
*`agent.hostname`*::
31143114
+
31153115
--
3116-
Deprecated - use agent.name or agent.id to identify an agent. Hostname of the agent.
3116+
Deprecated - use agent.name or agent.id to identify an agent.
31173117
31183118
3119-
type: keyword
3119+
type: alias
3120+
3121+
alias to: agent.name
31203122
31213123
--
31223124
@@ -3153,7 +3155,7 @@ alias to: host.name
31533155
--
31543156
type: alias
31553157
3156-
alias to: agent.hostname
3158+
alias to: agent.name
31573159
31583160
--
31593161

filebeat/include/fields.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

filebeat/module/osquery/_meta/kibana/7/dashboard/osquery-rootkit.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"id": "1",
114114
"params": {
115115
"customLabel": "Hosts",
116-
"field": "agent.hostname"
116+
"field": "agent.name"
117117
},
118118
"schema": "metric",
119119
"type": "cardinality"
@@ -185,7 +185,7 @@
185185
"columns": [
186186
"osquery.result.name",
187187
"osquery.result.columns.path",
188-
"agent.hostname"
188+
"agent.name"
189189
],
190190
"description": "",
191191
"hits": 0,

filebeat/module/santa/_meta/kibana/7/dashboard/filebeat-santa-log-overview.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
"id": "1",
270270
"params": {
271271
"customLabel": "Hosts Reporting",
272-
"field": "agent.hostname"
272+
"field": "agent.name"
273273
},
274274
"schema": "metric",
275275
"type": "cardinality"
@@ -373,7 +373,7 @@
373373
{
374374
"attributes": {
375375
"columns": [
376-
"agent.hostname",
376+
"agent.name",
377377
"process.executable",
378378
"user.name",
379379
"certificate.common_name"

0 commit comments

Comments
 (0)