diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 696b0f2debca..0043e26516e2 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -56,6 +56,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha1...master[Check the HEAD d - When collecting swap metrics for beats telemetry or system metricbeat module handle cases of free swap being bigger than total swap by assuming no swap is being used. {issue}6271[6271] {pull}9383[9383] - Adding logging traces at debug level when the pipeline client receives the following events: onFilteredOut, onDroppedOnPublish. {pull}9016[9016] - Ignore non index fields in default_field for Elasticsearch. {pull}9549[9549] +- Update Kibana index pattern attributes for objects that are disabled. {pull}9644[9644] - Enforce validation for the Central Management access token. {issue}9621[9621] *Auditbeat* diff --git a/libbeat/kibana/fields_transformer.go b/libbeat/kibana/fields_transformer.go index 0a8b120af2ea..74a816ad37ac 100644 --- a/libbeat/kibana/fields_transformer.go +++ b/libbeat/kibana/fields_transformer.go @@ -154,7 +154,15 @@ func transformField(version *common.Version, f common.Field) (common.MapStr, com } if f.Type == "object" && f.Enabled != nil { - field["enabled"] = getVal(f.Enabled, true) + enabled := getVal(f.Enabled, true) + field["enabled"] = enabled + if !enabled { + field["aggregatable"] = false + field["analyzed"] = false + field["doc_values"] = false + field["indexed"] = false + field["searchable"] = false + } } if f.Type == "text" { diff --git a/libbeat/kibana/fields_transformer_test.go b/libbeat/kibana/fields_transformer_test.go index faf96b6d1057..901226674484 100644 --- a/libbeat/kibana/fields_transformer_test.go +++ b/libbeat/kibana/fields_transformer_test.go @@ -309,6 +309,7 @@ func TestTransformMisc(t *testing.T) { {commonField: common.Field{Type: "binary", Enabled: &truthy}, expected: nil, attr: "enabled"}, {commonField: common.Field{Type: "object", Enabled: &truthy}, expected: true, attr: "enabled"}, {commonField: common.Field{Type: "object", Enabled: &falsy}, expected: false, attr: "enabled"}, + {commonField: common.Field{Type: "object", Enabled: &falsy}, expected: false, attr: "doc_values"}, // indexed {commonField: common.Field{Type: "binary"}, expected: false, attr: "indexed"},