From 1308825b8833c8479e73ee0c383fb7ede7684b83 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Mon, 29 Aug 2016 12:04:00 -0700 Subject: [PATCH 1/3] Clarify how to set the shipper name --- libbeat/_meta/fields.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libbeat/_meta/fields.yml b/libbeat/_meta/fields.yml index d6bd321bb281..ad6297cf9f0c 100644 --- a/libbeat/_meta/fields.yml +++ b/libbeat/_meta/fields.yml @@ -16,7 +16,8 @@ fields: description: > The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not - set, the hostname is used. + set, the hostname is used. To set the shipper name, use the `name` + option in the configuration file. - name: beat.hostname description: > The hostname as returned by the operating system on which the Beat is From a1b6119709ccf4613c6e76c5b79f5a8b833e8291 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Mon, 29 Aug 2016 12:04:57 -0700 Subject: [PATCH 2/3] Run make update --- filebeat/docs/fields.asciidoc | 2 +- metricbeat/docs/fields.asciidoc | 2 +- packetbeat/docs/fields.asciidoc | 2 +- winlogbeat/docs/fields.asciidoc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc index 97016bfbd2e4..1b3595b069f4 100644 --- a/filebeat/docs/fields.asciidoc +++ b/filebeat/docs/fields.asciidoc @@ -26,7 +26,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. +The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. [float] diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index a119933e067d..6f3a1dd8d8b1 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -363,7 +363,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. +The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. [float] diff --git a/packetbeat/docs/fields.asciidoc b/packetbeat/docs/fields.asciidoc index 283b0669ca5c..afd3f72693d2 100644 --- a/packetbeat/docs/fields.asciidoc +++ b/packetbeat/docs/fields.asciidoc @@ -365,7 +365,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. +The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. [float] diff --git a/winlogbeat/docs/fields.asciidoc b/winlogbeat/docs/fields.asciidoc index b5a305310ba5..100d4fbcf7f6 100644 --- a/winlogbeat/docs/fields.asciidoc +++ b/winlogbeat/docs/fields.asciidoc @@ -27,7 +27,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. +The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. [float] From 1bd029302e6050b42b4cd8480e68b99faececaf8 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Tue, 30 Aug 2016 09:34:07 -0700 Subject: [PATCH 3/3] Remove reference to shipper name --- filebeat/docs/fields.asciidoc | 2 +- libbeat/_meta/fields.yml | 4 ++-- metricbeat/docs/fields.asciidoc | 2 +- packetbeat/docs/fields.asciidoc | 2 +- winlogbeat/docs/fields.asciidoc | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc index 1b3595b069f4..42806cf28745 100644 --- a/filebeat/docs/fields.asciidoc +++ b/filebeat/docs/fields.asciidoc @@ -26,7 +26,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. +The name of the Beat sending the log messages. If the Beat name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the Beat name, use the `name` option in the configuration file. [float] diff --git a/libbeat/_meta/fields.yml b/libbeat/_meta/fields.yml index ad6297cf9f0c..28c93cc6b8f9 100644 --- a/libbeat/_meta/fields.yml +++ b/libbeat/_meta/fields.yml @@ -14,9 +14,9 @@ fields: - name: beat.name description: > - The name of the Beat sending the log messages. If the shipper name is + The name of the Beat sending the log messages. If the Beat name is set in the configuration file, then that value is used. If it is not - set, the hostname is used. To set the shipper name, use the `name` + set, the hostname is used. To set the Beat name, use the `name` option in the configuration file. - name: beat.hostname description: > diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 6f3a1dd8d8b1..798a9203f954 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -363,7 +363,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. +The name of the Beat sending the log messages. If the Beat name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the Beat name, use the `name` option in the configuration file. [float] diff --git a/packetbeat/docs/fields.asciidoc b/packetbeat/docs/fields.asciidoc index afd3f72693d2..16ccb30bdaff 100644 --- a/packetbeat/docs/fields.asciidoc +++ b/packetbeat/docs/fields.asciidoc @@ -365,7 +365,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. +The name of the Beat sending the log messages. If the Beat name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the Beat name, use the `name` option in the configuration file. [float] diff --git a/winlogbeat/docs/fields.asciidoc b/winlogbeat/docs/fields.asciidoc index 100d4fbcf7f6..d8e838a7f50b 100644 --- a/winlogbeat/docs/fields.asciidoc +++ b/winlogbeat/docs/fields.asciidoc @@ -27,7 +27,7 @@ Contains common beat fields available in all event types. [float] === beat.name -The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the configuration file. +The name of the Beat sending the log messages. If the Beat name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the Beat name, use the `name` option in the configuration file. [float]