diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 6e0eb0967ac..e5152441e17 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -152,6 +152,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add `container.id` and `container.runtime` ECS fields in container metricset. {pull}29560[29560] - Add `memory.workingset.limit.pct` field in Kubernetes container/pod metricset. {pull}29547[29547] - Add `elasticsearch.cluster.id` field to Beat and Kibana modules. {pull}29577[29577] +- Add `elasticsearch.cluster.id` field to Logstash module. {pull}29625[29625] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index e1e256d0dc3..2a866020d37 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -46325,6 +46325,13 @@ alias to: logstash.node.state.pipeline.hash -- +*`logstash.elasticsearch.cluster.id`*:: ++ +-- +type: keyword + +-- + [float] === node diff --git a/metricbeat/module/logstash/_meta/fields.yml b/metricbeat/module/logstash/_meta/fields.yml index caa5d152974..850e5b0ba0d 100644 --- a/metricbeat/module/logstash/_meta/fields.yml +++ b/metricbeat/module/logstash/_meta/fields.yml @@ -104,3 +104,5 @@ - name: logstash type: group fields: + - name: elasticsearch.cluster.id + type: keyword diff --git a/metricbeat/module/logstash/fields.go b/metricbeat/module/logstash/fields.go index c2a1e208929..0f9ed630565 100644 --- a/metricbeat/module/logstash/fields.go +++ b/metricbeat/module/logstash/fields.go @@ -32,5 +32,5 @@ func init() { // AssetLogstash returns asset data. // This is the base64 encoded zlib format compressed contents of module/logstash. func AssetLogstash() string { - return "eJy8Wc2Oq0YT3fspSl5/F+lbZONFlEUSZaJEyepuogj1QBn3vUB3+sfJ5OkjsMFA/xWGGRazaFznnKouqqtrPsFXfDtBLSptmL4cAAw3NZ7g+Mt96XgAKFEXikvDRXuCbw8AAMNraERpazwAKKyRaTxBxQ4AGo3hbaVP8MdR6/r4PzhejJHHP7t3F6FMXoj2zKsTnFmtO/szx7rUpx79E7SswYeuXBtmdP8KwLzJjkUJK+8rU9OpueENasMaOb4ZrFnNmZ6sSmYuJzh+N1ocHbAv18aBmYrwCZnaN9jM1kMYIZwp1gWZzK3GMudt/vpmUDs/DXk693gIcNaKErM+ytmXa5M12GQEkpmehv3z7nKCHIMSK7st7H7T8LrmS6qwiLiAIOzAi1dsjd6UILzdQexNR7bAGiiENftxLMEGktIq1pWKXTfhzhnBXtaMTXthLS93UD2uOXgD0RWV5mKPnR/XlpADleQSa96im6UtaoOlYyC25XMh7W4Fr3MxWFN8gDHQKXBrm1dUuTjnWDPZFTuJiovSV6MgWcUgukNCZ0WvNSuk7deydfTTcy03FyWMqbHMW9aKD9JLZnbj2x+tD9uPjm+K/lE+WJmzKypW4btk3P+/WfYBe/kubTZVn4WYRiUfJiSu48MCsiAaC5VvO5+vVYW0rChMZjWrMPiJPNsOzZI8yDPWfCUK1LdQSFQFtobYC/u4Y2gD418WLd6P67wQdhNhAMx7PcDV14PhQMxmZ/M6jZj5UByGi68heYJjxAl0O3TnO/Tk8e65+A3Pwn5++xue9yS/3QmhQaN4obPVWmDRXjyivFslcHrIB9xXfPtbqPAxtEiYtPFoKPTaHr8zybo/HcLiFw2vbh33CYyyy7eRLeqen4Q24IBua301qisv0Olyd5A7zjQ+e7D9YwCI5keC7+fPv8JLexYrs8rvOSRTK6mne3yuw6yihXM6fpgNh4cfIb5xRPG/3yjg5fvgV+6/iz7zcbuJEMeLYQJ9gjEnqkVbRdHcqRNNaUotrJ1GEXU7uImpEgE2OKKZ24YiQci7H3pkb34Bcded4Q/BMbK+7nlpC9HwtrqHAfpuClUWVeXOi/aW9Zs1lVgr68xrgypxh9yu7cc7zSptyekXQWVklDW33lRn3BHXHDx8jlDOojSOd8y0n3/u+ImGncIH+rCATkghBdIQYc4ZrbNAmQU8ibdVX/RuPsfYYyNpd3aidiBlIc0BihOQHpSuJ6USw4ZhqqsqmV/w3Bh0I9PaKSaRjjalmQOVwr7WbrGJDfnnAIth/+MhtSnbj4zAzXYdSD8YeveqEJhi+QlJ5aD7aRIpFgBYBiHX/F/cufHueu5dwZMtOOy6b+G2laAVnmnmCLiTlsnwIhjN/aKwp3hwv4rgjWUl3FCxcpQXbFCxOg9WGSB/I4smfx3JwtPN6bQQQ4BN1lt4NhIEt2+fvrT6kj+RQ+daRFuQmZp1VKT/MczV9PvyXwAAAP//XRLRjg==" + return "eJy8Wb2OrEYTzfcpShN/F+kLnExgObAtr2XLjm5iWagXaqDvbeh2/4y9fnoLZmCB/qEY2CWYAKhzTlcV1dU1n+Arvp5ByMpYZuonAMutwDOcfrnfOj0BlGgKzZXlsj3Dt08AAMNjaGTpBD4BaBTIDJ6hYk8ABq3lbWXO8MfJGHH6H5xqa9Xpz+5ZLbXNC9leeHWGCxOms79wFKU59+ifoGUNvunKjWXW9I8A7KvqWLR06n5najo1t7xBY1mjxieDNROcmcldxWx9htN3o8XJA/tybTyYqYiQkKl9g83sfgwjhjPFqpGp3Bksc97mL68WjfdqbKXzFQ8OzlpZYtZ7OftybbIGm4xAMtPTsH/eXU6UY1DiVBfC7p2GC8GXVHERaQFR2IEXr9hasytBeHuA2JuObIE1UEhnj+NYgg0kpdOsKxWHBuHOmcBe1oxdsXCOlweoHu95eAPRFbXh8ojIj/eWkAOV4goFb9HP0haNxdIzkPvyuVDusILXLTFaU0KAKdApcOuaF9S5vOQomOqKnULNZRmqUbBaxSAZIWmyoteaFcr197Jt9NN9Lbe1ltYKLPOWtfKD9JKZff/2W+ub7Uf7d43+rXywMmdX1KzCd8m4/3+z7AOOWrty2VR9FmMalXyYkLSOD3PIgmgsVKFwPl6rCuVYUdjMGVZh9BN5tB2aJXmUZ6z5WhZobq5QqAtsLbEXDnGn0AbGvxw6vG/XeSHdLsIIWPB4gJuPB8OGmM325m0aMQuheAx1qCF5gGPEiXQ79MWjYMbywiDTRZ0VwhmLOuSJr/j6t9T+2jp5q/1B4OQ4XAv7+fFxuGLqjyC/HSqhQat5YbLNWmDRn7yF6bBS4jWhEA3L0nSRcevGo6E0Ww8JnUnW/XQIizcaXt1a9jNY7ZZPEyHqrp+kseCB7uudDeorL9Brkw+QOw5FPgeww3MESObHCt/Pn3+F5/YiN2ZVeOWwmlqrerortHSYlcR4Tqd3w2H3CSOkA0cU//uNAp6/j37l4cPsIx+3nwhpvBQm0EcgcyIh2yqJ5o+taErX1MLWcRZRt4e7MpYiwEZnPHPbmCcIefdDjxzMLyBG3ZseERZG1tddz20hG95WdzdA346hzpKq/IHT0bJ+c7aSW2VduLCoVw6h+7X9eKfZpG11fEZQmZiFza131Rl/RjYHj+8jlL1oHSc4pzpuff78ioa9hg/0aQOdkEIKpCnEnDNZZ4EyTHgQb6++5OF+jnFEIGmHfqJ2IGUhbQGURcD6pHU7KZUYdkxjfVWr+QWPzVF3Mm0dgxLpaGOeOVAp3Yvwi03qX4I5wOLfgreL1Kbs3zIiJ9ttIP1k6d2rQmQMFiYklYPu1VWklANg6YTc8H/x4Ma767kPBV9tweHQuMXbVoJWeKSZI+BOWibLi6g3j/PCkeLB/yqiJ5aNcEPFylHV2KBmIo9WGSB/I4smfxvJYqW702khhgC7Wm/hUU8Qln379JUzdf5ADl2ETLYgMzXbqEh/UszV9HH5LwAA//8MYuTR" } diff --git a/metricbeat/module/logstash/node/_meta/data.json b/metricbeat/module/logstash/node/_meta/data.json index a847bea944a..cfc36e09d31 100644 --- a/metricbeat/module/logstash/node/_meta/data.json +++ b/metricbeat/module/logstash/node/_meta/data.json @@ -9,6 +9,11 @@ "cluster": { "id": "VUwnkX_lTzCFP9VUoXT1IQ" }, + "elasticsearch": { + "cluster": { + "id": "VUwnkX_lTzCFP9VUoXT1IQ" + } + }, "node": { "host": "7dc1b688baf4", "id": "9a1f83e1-52b9-4625-a98a-6aa336f41719", @@ -101,4 +106,4 @@ "type": "logstash", "version": "7.12.0" } -} \ No newline at end of file +} diff --git a/metricbeat/module/logstash/node/data.go b/metricbeat/module/logstash/node/data.go index bb9f51c9847..1d5725ed969 100644 --- a/metricbeat/module/logstash/node/data.go +++ b/metricbeat/module/logstash/node/data.go @@ -122,6 +122,7 @@ func eventMapping(r mb.ReporterV2, content []byte, pipelines []logstash.Pipeline if clusterUUID != "" { event.ModuleFields.Put("cluster.id", clusterUUID) + event.ModuleFields.Put("elasticsearch.cluster.id", clusterUUID) } event.ID = pipeline.EphemeralID diff --git a/metricbeat/module/logstash/node_stats/_meta/data.json b/metricbeat/module/logstash/node_stats/_meta/data.json index 5343737c3b4..b218c10246e 100644 --- a/metricbeat/module/logstash/node_stats/_meta/data.json +++ b/metricbeat/module/logstash/node_stats/_meta/data.json @@ -6,7 +6,14 @@ "module": "logstash" }, "logstash": { - "cluster.id": "VUwnkX_lTzCFP9VUoXT1IQ", + "cluster": { + "id": "VUwnkX_lTzCFP9VUoXT1IQ" + }, + "elasticsearch": { + "cluster": { + "id": "VUwnkX_lTzCFP9VUoXT1IQ" + } + }, "node": { "stats": { "events": { @@ -136,4 +143,4 @@ "type": "logstash", "version": "7.12.0" } -} \ No newline at end of file +} diff --git a/metricbeat/module/logstash/node_stats/data.go b/metricbeat/module/logstash/node_stats/data.go index 85eaaa8b493..d91e2724548 100644 --- a/metricbeat/module/logstash/node_stats/data.go +++ b/metricbeat/module/logstash/node_stats/data.go @@ -204,7 +204,8 @@ func eventMapping(r mb.ReporterV2, content []byte, isXpack bool) error { event.RootFields.Put("service.version", nodeStats.Version) if clusterUUID != "" { - event.ModuleFields["cluster.id"] = clusterUUID + event.ModuleFields.Put("cluster.id", clusterUUID) + event.ModuleFields.Put("elasticsearch.cluster.id", clusterUUID) } // xpack.enabled in config using standalone metricbeat writes to `.monitoring` instead of `metricbeat-*`