From 4c383605e36a140dce328b08372c5d106bd79977 Mon Sep 17 00:00:00 2001 From: Silvia Mitter Date: Wed, 26 Feb 2020 16:38:14 +0100 Subject: [PATCH] Remove experimental flag from append_fields (#16576) (#16598) closes #15605 --- CHANGELOG.next.asciidoc | 1 + auditbeat/auditbeat.reference.yml | 1 - filebeat/filebeat.reference.yml | 1 - filebeat/script.tar.gz | Bin 0 -> 3927 bytes heartbeat/heartbeat.reference.yml | 1 - journalbeat/journalbeat.reference.yml | 1 - libbeat/_meta/config.reference.yml.tmpl | 1 - libbeat/docs/template-config.asciidoc | 13 +++++-------- libbeat/template/template.go | 2 -- metricbeat/metricbeat.reference.yml | 1 - packetbeat/packetbeat.reference.yml | 1 - winlogbeat/winlogbeat.reference.yml | 1 - x-pack/auditbeat/auditbeat.reference.yml | 1 - x-pack/filebeat/filebeat.reference.yml | 1 - x-pack/functionbeat/functionbeat.reference.yml | 1 - x-pack/metricbeat/metricbeat.reference.yml | 1 - x-pack/winlogbeat/winlogbeat.reference.yml | 1 - 17 files changed, 6 insertions(+), 23 deletions(-) create mode 100644 filebeat/script.tar.gz diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 04472dea3fd..01a5409873e 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -178,6 +178,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Include network information by default on add_host_metadata and add_observer_metadata. {issue}15347[15347] {pull}16077[16077] - Add `aws_ec2` provider for autodiscover. {issue}12518[12518] {pull}14823[14823] - Add support for multiple password in redis output. {issue}16058[16058] {pull}16206[16206] +- Remove experimental flag from `setup.template.append_fields` {pull}16576[16576] *Auditbeat* diff --git a/auditbeat/auditbeat.reference.yml b/auditbeat/auditbeat.reference.yml index 9110e57b75e..886b5fec5d8 100644 --- a/auditbeat/auditbeat.reference.yml +++ b/auditbeat/auditbeat.reference.yml @@ -1033,7 +1033,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 57082c85509..982f26a1a33 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -1738,7 +1738,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/filebeat/script.tar.gz b/filebeat/script.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..249c023be020c1d24e586edc11438925eafa9916 GIT binary patch literal 3927 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 literal 0 HcmV?d00001 diff --git a/heartbeat/heartbeat.reference.yml b/heartbeat/heartbeat.reference.yml index 233ae8b4889..68bdaa254f9 100644 --- a/heartbeat/heartbeat.reference.yml +++ b/heartbeat/heartbeat.reference.yml @@ -1177,7 +1177,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/journalbeat/journalbeat.reference.yml b/journalbeat/journalbeat.reference.yml index 38357dc0de7..79170a53c19 100644 --- a/journalbeat/journalbeat.reference.yml +++ b/journalbeat/journalbeat.reference.yml @@ -971,7 +971,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/libbeat/_meta/config.reference.yml.tmpl b/libbeat/_meta/config.reference.yml.tmpl index aae8dcfbb8a..160eca48f8a 100644 --- a/libbeat/_meta/config.reference.yml.tmpl +++ b/libbeat/_meta/config.reference.yml.tmpl @@ -914,7 +914,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/libbeat/docs/template-config.asciidoc b/libbeat/docs/template-config.asciidoc index 83dc859da31..9f84f65e429 100644 --- a/libbeat/docs/template-config.asciidoc +++ b/libbeat/docs/template-config.asciidoc @@ -83,17 +83,16 @@ setup.template.settings: _source.enabled: false ---------------------------------------------------------------------- -ifeval::["{beatname_lc}"!="apm-server"] -*`setup.template.append_fields`* experimental[]:: A list of fields to be added +*`setup.template.append_fields`*:: A list of fields to be added to the template and {kib} index pattern. This setting adds new fields. It does -not overwrite or change existing fields. +not overwrite or change existing fields. + This setting is useful when your data contains fields that {beatname_uc} doesn't -know about in advance. +know about in advance. ifeval::["{beatname_lc}"=="metricbeat"] For example, you might want to append fields to the template when you're using a metricset, such as the <>, and the full data -structure is not known in advance. +structure is not known in advance. endif::[] + If `append_fields` is specified along with `overwrite: true`, {beatname_uc} @@ -118,7 +117,7 @@ setup.template.append_fields: *`setup.template.json.enabled`*:: Set to `true` to load a JSON-based template file. Specify the path to your {es} index template file and -set the name of the template. +set the name of the template. + ["source","yaml",subs="attributes"] ---------------------------------------------------------------------- @@ -129,5 +128,3 @@ setup.template.json.name: "template-name NOTE: If the JSON template is used, the `fields.yml` is skipped for the template generation. - -endif::[] diff --git a/libbeat/template/template.go b/libbeat/template/template.go index fa4ee37a6e5..83d393b293a 100644 --- a/libbeat/template/template.go +++ b/libbeat/template/template.go @@ -26,7 +26,6 @@ import ( "github.com/elastic/beats/libbeat/beat" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/common/fmtstr" "github.com/elastic/beats/libbeat/mapping" ) @@ -145,7 +144,6 @@ func (t *Template) load(fields mapping.Fields) (common.MapStr, error) { var err error if len(t.config.AppendFields) > 0 { - cfgwarn.Experimental("append_fields is used.") fields, err = mapping.ConcatFields(fields, t.config.AppendFields) if err != nil { return nil, err diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index a254561452a..249dce096e6 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -1725,7 +1725,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/packetbeat/packetbeat.reference.yml b/packetbeat/packetbeat.reference.yml index 6de6530fe94..955d6b55173 100644 --- a/packetbeat/packetbeat.reference.yml +++ b/packetbeat/packetbeat.reference.yml @@ -1455,7 +1455,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/winlogbeat/winlogbeat.reference.yml b/winlogbeat/winlogbeat.reference.yml index df9f38ad64c..c6e642ac5cf 100644 --- a/winlogbeat/winlogbeat.reference.yml +++ b/winlogbeat/winlogbeat.reference.yml @@ -956,7 +956,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/x-pack/auditbeat/auditbeat.reference.yml b/x-pack/auditbeat/auditbeat.reference.yml index 2f4c6c3ffd1..9790dd18f9b 100644 --- a/x-pack/auditbeat/auditbeat.reference.yml +++ b/x-pack/auditbeat/auditbeat.reference.yml @@ -1084,7 +1084,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml index 8ffb84c3a70..3758e1cb07c 100644 --- a/x-pack/filebeat/filebeat.reference.yml +++ b/x-pack/filebeat/filebeat.reference.yml @@ -2284,7 +2284,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/x-pack/functionbeat/functionbeat.reference.yml b/x-pack/functionbeat/functionbeat.reference.yml index dc06b3cbe85..8b0ebe14778 100644 --- a/x-pack/functionbeat/functionbeat.reference.yml +++ b/x-pack/functionbeat/functionbeat.reference.yml @@ -982,7 +982,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index c521e6b81e7..fc65c615668 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -1958,7 +1958,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type diff --git a/x-pack/winlogbeat/winlogbeat.reference.yml b/x-pack/winlogbeat/winlogbeat.reference.yml index 9bcc352079c..0320918d6b2 100644 --- a/x-pack/winlogbeat/winlogbeat.reference.yml +++ b/x-pack/winlogbeat/winlogbeat.reference.yml @@ -959,7 +959,6 @@ output.elasticsearch: # A list of fields to be added to the template and Kibana index pattern. Also # specify setup.template.overwrite: true to overwrite the existing template. -# This setting is experimental. #setup.template.append_fields: #- name: field_name # type: field_type