From aebbe8cd3e6a37f2b01c5e0346ce702a5c4a5c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Tue, 23 Oct 2018 15:51:51 +0100 Subject: [PATCH] Cherry-pick #8596 to 6.x: Enable `host` and `cloud` metadata processors by default (#8686) * Enable `host` and `cloud` metadata processors by default (#8596) InfraOps UI will leverage this info to provide better insights from the application, we decided to enable these by default as that should benefit most users. (cherry picked from commit 98121576fce6a705c04713ebd4b087ab774c6b4e) * Update CHANGELOG.asciidoc --- CHANGELOG.asciidoc | 1 + auditbeat/auditbeat.yml | 8 ++++++++ filebeat/filebeat.yml | 8 ++++++++ heartbeat/heartbeat.yml | 8 ++++++++ libbeat/_meta/config.yml | 8 ++++++++ metricbeat/metricbeat.yml | 8 ++++++++ packetbeat/packetbeat.yml | 8 ++++++++ winlogbeat/winlogbeat.yml | 8 ++++++++ 8 files changed, 57 insertions(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index c2aa3b75bf8b..1fa9ac9d6c4f 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -109,6 +109,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff] - Added the `add_process_metadata` processor to enrich events with process information. {pull}6789[6789] - Add Beats Central Management {pull}8559[8559] - Report configured queue type. {pull}8091[8091] +- Enable `host` and `cloud` metadata processors by default. {pull}8596[8596] *Auditbeat* diff --git a/auditbeat/auditbeat.yml b/auditbeat/auditbeat.yml index a3749aa2af06..24edf9200513 100644 --- a/auditbeat/auditbeat.yml +++ b/auditbeat/auditbeat.yml @@ -142,6 +142,14 @@ output.elasticsearch: # Client Certificate Key #ssl.key: "/etc/pki/client/cert.key" +#================================ Procesors ===================================== + +# Configure processors to enhance or manipulate events generated by the beat. + +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + #================================ Logging ===================================== # Sets log level. The default log level is info. diff --git a/filebeat/filebeat.yml b/filebeat/filebeat.yml index 52888b19ea5d..15ce2d444947 100644 --- a/filebeat/filebeat.yml +++ b/filebeat/filebeat.yml @@ -169,6 +169,14 @@ output.elasticsearch: # Client Certificate Key #ssl.key: "/etc/pki/client/cert.key" +#================================ Procesors ===================================== + +# Configure processors to enhance or manipulate events generated by the beat. + +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + #================================ Logging ===================================== # Sets log level. The default log level is info. diff --git a/heartbeat/heartbeat.yml b/heartbeat/heartbeat.yml index 044616ad816c..2d881a7db82a 100644 --- a/heartbeat/heartbeat.yml +++ b/heartbeat/heartbeat.yml @@ -116,6 +116,14 @@ output.elasticsearch: # Client Certificate Key #ssl.key: "/etc/pki/client/cert.key" +#================================ Procesors ===================================== + +# Configure processors to enhance or manipulate events generated by the beat. + +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + #================================ Logging ===================================== # Sets log level. The default log level is info. diff --git a/libbeat/_meta/config.yml b/libbeat/_meta/config.yml index 6f460928bac4..0db1fd3a2909 100644 --- a/libbeat/_meta/config.yml +++ b/libbeat/_meta/config.yml @@ -86,6 +86,14 @@ output.elasticsearch: # Client Certificate Key #ssl.key: "/etc/pki/client/cert.key" +#================================ Procesors ===================================== + +# Configure processors to enhance or manipulate events generated by the beat. + +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + #================================ Logging ===================================== # Sets log level. The default log level is info. diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml index 5bb313ded910..259092c66dff 100644 --- a/metricbeat/metricbeat.yml +++ b/metricbeat/metricbeat.yml @@ -113,6 +113,14 @@ output.elasticsearch: # Client Certificate Key #ssl.key: "/etc/pki/client/cert.key" +#================================ Procesors ===================================== + +# Configure processors to enhance or manipulate events generated by the beat. + +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + #================================ Logging ===================================== # Sets log level. The default log level is info. diff --git a/packetbeat/packetbeat.yml b/packetbeat/packetbeat.yml index 5bdaa0f6911c..e27356624a29 100644 --- a/packetbeat/packetbeat.yml +++ b/packetbeat/packetbeat.yml @@ -196,6 +196,14 @@ output.elasticsearch: # Client Certificate Key #ssl.key: "/etc/pki/client/cert.key" +#================================ Procesors ===================================== + +# Configure processors to enhance or manipulate events generated by the beat. + +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + #================================ Logging ===================================== # Sets log level. The default log level is info. diff --git a/winlogbeat/winlogbeat.yml b/winlogbeat/winlogbeat.yml index d711c7f10db0..361c13f87e06 100644 --- a/winlogbeat/winlogbeat.yml +++ b/winlogbeat/winlogbeat.yml @@ -117,6 +117,14 @@ output.elasticsearch: # Client Certificate Key #ssl.key: "/etc/pki/client/cert.key" +#================================ Procesors ===================================== + +# Configure processors to enhance or manipulate events generated by the beat. + +processors: + - add_host_metadata: ~ + - add_cloud_metadata: ~ + #================================ Logging ===================================== # Sets log level. The default log level is info.