Skip to content

Commit 99c19c7

Browse files
committed
take ownership of host.name
1 parent ceeffdb commit 99c19c7

File tree

10 files changed

+11
-23
lines changed

10 files changed

+11
-23
lines changed

_meta/fields.common.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,8 @@
382382
path: context.system.ip
383383

384384
- name: name
385-
type: keyword
386-
description: >
387-
Hostname.
385+
type: alias
386+
path: context.system.hostname
388387

389388
- name: os
390389
type: group

docs/fields.asciidoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -604,13 +604,10 @@ type: alias
604604
605605
--
606606
607-
*`host.name`*::
607+
*`context.system.hostname`*::
608608
+
609609
--
610-
type: keyword
611-
612-
Hostname.
613-
610+
type: alias
614611
615612
--
616613

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.

processor/error/package_tests/attrs_common.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func fieldsNotInPayloadAttrs(s *tests.Set) *tests.Set {
5151
"context.user.user-agent", "context.user.ip", "context.system.ip",
5252
"context.http", "context.http.status_code",
5353
tests.Group("container"),
54-
tests.Group("host"),
5554
tests.Group("timestamp"),
5655
))
5756
}
@@ -102,7 +101,7 @@ func condRequiredKeys(c map[string]tests.Condition) map[string]tests.Condition {
102101

103102
func keywordExceptionKeys(s *tests.Set) *tests.Set {
104103
return tests.Union(s, tests.NewSet(
105-
"host.name", "processor.event", "processor.name", "listening", "error.grouping_key",
104+
"processor.event", "processor.name", "listening", "error.grouping_key",
106105
"error.id", "transaction.id", "context.tags", "labels", "parent.id", "trace.id", "url.scheme",
107106
"view errors", "error id icon"))
108107
}

processor/stream/package_tests/error_attrs_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ func errorFieldsNotInPayloadAttrs() *tests.Set {
5353
"context.user.user-agent", "context.user.ip", "context.system.ip",
5454
"context.http", "context.http.status_code",
5555
tests.Group("container"),
56-
tests.Group("host"),
5756
)
5857
}
5958

@@ -112,7 +111,7 @@ func errorCondRequiredKeys() map[string]tests.Condition {
112111

113112
func errorKeywordExceptionKeys() *tests.Set {
114113
return tests.NewSet(
115-
"host.name", "processor.event", "processor.name", "listening", "error.grouping_key", "url.scheme",
114+
"processor.event", "processor.name", "listening", "error.grouping_key", "url.scheme",
116115
"context.tags", "labels",
117116
"view errors", "error id icon",
118117
tests.Group("context.service"),

processor/stream/package_tests/metadata_attrs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func TestMetadataPayloadMatchJsonSchema(t *testing.T) {
113113
func TestKeywordLimitationOnMetadataAttrs(t *testing.T) {
114114
metadataProcSetup().KeywordLimitation(
115115
t,
116-
tests.NewSet("host.name", "processor.event", "processor.name", "listening", "labels", "url.scheme",
116+
tests.NewSet("processor.event", "processor.name", "listening", "labels", "url.scheme",
117117
tests.Group("context.request"),
118118
tests.Group("context.tags"),
119119
tests.Group("transaction"),

processor/stream/package_tests/span_attrs_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ func spanFieldsNotInPayloadAttrs() *tests.Set {
5959
"span.parent", // from v1
6060
// ECS field copies
6161
tests.Group("container"),
62-
tests.Group("host"),
6362
"url",
6463
"url.port",
6564
"url.scheme",
@@ -120,7 +119,7 @@ func transactionContext() *tests.Set {
120119

121120
func spanKeywordExceptionKeys() *tests.Set {
122121
return tests.Union(tests.NewSet(
123-
"host.name", "processor.event", "processor.name", "listening", "url.scheme",
122+
"processor.event", "processor.name", "listening", "url.scheme",
124123
"context.tags", "labels",
125124
),
126125
transactionContext(),

processor/stream/package_tests/transaction_attrs_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ func transactionFieldsNotInPayloadAttrs() *tests.Set {
5555
"context.http",
5656
"context.http.status_code",
5757
tests.Group("container"),
58-
tests.Group("host"),
5958
)
6059
}
6160

@@ -89,7 +88,7 @@ func transactionRequiredKeys() *tests.Set {
8988

9089
func transactionKeywordExceptionKeys() *tests.Set {
9190
return tests.NewSet(
92-
"host.name", "processor.event", "processor.name", "listening",
91+
"processor.event", "processor.name", "listening",
9392
"transaction.marks",
9493
"context.tags",
9594
"labels",

processor/transaction/package_tests/attrs_common.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ func fieldsNotInPayloadAttrs(s *tests.Set) *tests.Set {
4848
"listening", "view spans", "context.user.user-agent",
4949
"context.user.ip", "context.system.ip",
5050
tests.Group("container"),
51-
tests.Group("host"),
5251
tests.Group("timestamp")))
5352
}
5453

@@ -102,7 +101,7 @@ func condRequiredKeys(c map[string]tests.Condition) map[string]tests.Condition {
102101

103102
func keywordExceptionKeys(s *tests.Set) *tests.Set {
104103
return tests.Union(s, tests.NewSet(
105-
"host.name", "processor.event", "processor.name", "listening", "parent.id", "trace.id",
104+
"processor.event", "processor.name", "listening", "parent.id", "trace.id",
106105
"transaction.id", "transaction.marks", "context.tags", "labels", "span.hex_id", "url.scheme"))
107106
}
108107

vendor/github.com/elastic/beats/libbeat/publisher/pipeline/module.go

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)