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 00000000000..249c023be02 Binary files /dev/null and b/filebeat/script.tar.gz differ 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