From 6cd6ae11261864f01fae5444b858f1b43080d9c1 Mon Sep 17 00:00:00 2001 From: Mariana Dima Date: Fri, 15 Oct 2021 15:28:39 +0200 Subject: [PATCH] Register `storage_account` as second name for `storage` metricset (#28447) * add storage * changelog * add fields --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 10 ++++++++++ x-pack/metricbeat/module/azure/fields.go | 2 +- .../metricbeat/module/azure/storage/_meta/fields.yml | 7 +++++++ x-pack/metricbeat/module/azure/storage/storage.go | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e26123258b2..0fbaae8774c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -898,6 +898,7 @@ for a few releases. Please use other tools provided by Elastic to fetch data fro - Move openmetrics module to oss. {pull}26561[26561] - Add `gke` metricset collection to `gcp` module {pull}26824[26824] - Added a new beta `enterprisesearch` module for Elastic Enterprise Search {pull}27549[27549] +- Register additional name for `storage` metricset in the azure module. {pull}28447[28447] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index d8d61d503f2..b8e507159ed 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -6203,6 +6203,16 @@ monitor storage account +type: object + +-- + +*`azure.storage_account.*.*`*:: ++ +-- +storage account + + type: object -- diff --git a/x-pack/metricbeat/module/azure/fields.go b/x-pack/metricbeat/module/azure/fields.go index 8f3ddad984c..b5165fc5a67 100644 --- a/x-pack/metricbeat/module/azure/fields.go +++ b/x-pack/metricbeat/module/azure/fields.go @@ -19,5 +19,5 @@ func init() { // AssetAzure returns asset data. // This is the base64 encoded zlib format compressed contents of module/azure. func AssetAzure() string { - return "eJzkmc9u67YSxvd5ikGWAU4ewIsL5LZdnEXRon/WxJgaK2wkkoccOsd9+oKiJMuSLMu27CaoFwZiUd/vG3JmJDJf4I12K8C/g6MHAFZc0AoeX+Lfjw8AGXnplGVl9Ar+9wAAaSyUJgtFvMVRQehpBTk+AGwUFZlfVQO/gMaS9uLxwzsbhzoTbP3LCOFQpivFqqTcodLtlUbyjXbvxmWd30eF0+ePV4KXFAaxU3JEtyE68iY4SQNgN4YZuEYHvCWpNoq6VvvhHoS8s3Rw4XjEJ2w0VuLtYDbAHVuj6Pi9LDoqzkL3Z3cBdrsCQ+12rjH3z0+jWLP+iyT3LqUfxZSxzhBRorVK5/X4x6fH84JIGduGUZkd5Gv89hZHEvbsCmmlwFNBkjsp29B8WLcSQmXXM7uC8PXHARCtLZTExXgdvTFcpkrSXhl9mBZHUuJEOsxNhQnLB02rY25gPA3xz09n+94UBo9cvNT1z8kMOOLgNGVDu2itUNqr/JX9yU7bPnHWxDjPQXeZRzhT/dczOhYZ8ngrHLkwoxdVosN7GybpbGki6ew4bzxb4Izm188aWLT1xQBqj6Op4/kwspvkTR/yX08aR98CefZCmqD52YdylDyWGSfQvyVlqISn2RtUBWW3gCflCQ/Bk2uCD1p9C+Mzf4GFPz25CbAnX3X9m7B/T+In48bAr6Q5FgdlC3t46Won3oSftTPvnpxgVSqde6GJ3417E1lwVeE+4zZfytn/EwtqFtQsaFizDPqqUu/gzlf1e441R5LUlsQdzNWo8/xZZ2RMUJ3fZQL3uPNssmEs7uKwIk2bo++SKr0bdOqfGu2J+uzw63m6oQNAblYDCtpSccqSJ7e9uaMEmTBkyW2MK1FLSosUW2xJpXE7gVtUBa4LEusdk18ym37dY6HBQsJCi4UKO992XTTCOrVFvpfrmgo19VLT0gZhyUnSjDmlQr6bd2kD7OGptq8N4V8yf7ZtZaoVi86FJ2l0djfnX39J2RL9QWIPdhlrVRRK57fYY9TSgDq+68SFz4hRFXM3qDI4R1ruRufq4tOyUdV2IR0xfhfS+P46XLxCP/S12iMYsui4JM1i+fPIvfjwsHMfrMnCYPd7JbgWHZ7u7t+yY/+ptnwLbuhSfp3YSCY06X5Y14Mn95N1HcQOoEx2eLoH1894U2ZJHnry7WmCrNrDDVKtLfNEOJ5vKDlgsWhxVSedlSwMZBvsxjiS6HlxcCN8HJ0SbuGzi7qVdu9tO6YpbWAS27J34nX4v6xDF3c/Nd27nAhAeIkFeeLPEUlrt70+EptmVJqcUNpzfGJ/7NBqt9C4nQjIUa48u93nCKhxOxFQ3Neoz7JAtdlBOBkyrtGTqDvzR46m8do8RQbBlEYrNm7+e2o+8y11KNx/Jz1e0p6Ni1uRDzyxtcV2Xv8JAAD//1lC3T4=" + return "eJzkmc9u67YSxvd5ikGWAU4ewIsL5LZdnEXRon/WxJgaK2wkkoccOsd9+oKiJMuSLMu27CaoFwZiSt/vG3JmJDJf4I12K8C/g6MHAFZc0AoeX+Lfjw8AGXnplGVl9Ar+9wAA6VooTRaKeIujgtDTCnJ8ANgoKjK/qi78AhpL2ovHD+9svNSZYOtfRgiHMl0pViXlDpVuRxrJN9q9G5d1fh8VTp8/XgleUhjETskR3YboyJvgJA2A3Rhm4Bod8Jak2ijqWu2HexDyztLBwPGIT9horMTbwWyAO7ZG0fF7WXRUnIXuz+4C7HYFhtrtXGPun59GsWb9F0nuDaUfxZSxziWiRGuVzuvrH58ezwsiZWwbRmV2kK/x21scSdizK6SVAk8FSe6kbEPzYd1KCJVdz+wKwtcfB0C0tlASF+N19MZwmSpJe2X0YVocSYkT6TA3FSYsHzStjrmB8XSJf3462/emMHhk8FLXPycz4IiD05QN7aK1Qmmv8lf2Jztt+8RZE+M8B91lHuFM9V/P6FhkyOOtcGRgRi+qRIf3NkzS2dJE0tlx3ni2wBnNr581sGjriwHUHkdTx/NhZDfJmz7kv540jr4F8uyFNEHzsw/lKHksM06gf0vKUAlPszeoCspuAU/KEx6CJ9cEH7T6FsZn/gILf3pyE2BPvur6N2H/nsRPxo2BX0lzLA7KFvbw0tVOvAk/a2fePTnBqlQ690ITvxv3JrLgqsJ9xm2+lLP/JxbULKhZ0LBmGfRVpd7Bna/q9xxrjiSpLYk7mKtR5/mzzsiYoDq/ywTucefZZMNY3MVhRZo2R98lVXo36NQ/NdoT9dnh1/N0QweA3KwGFLSl4pQlT257c0cJMmHIktsYV6KWlBYpttiSSuN2AreoClwXJNY7Jr9kNv26x0KDhYSFFgsVdr7tumiEdWqLfC/XNRVq6qWmpQ3CkpOkGXNKhXw379IG2MNTbV8bwr9k/mzbylQrFp0LT9Lo7G7Ov/6SsiX6g8Qe7DLWqiiUzm+xx6ilAXV814kLnxGjKuZuUGVwjrTcjc7Vxadlo6rtQjpi/C6k8f11uHiFfuhrtUcwZNFxSZrF8ueRe/HhYec+WJOFwe73SnAtOjzd3b9lx/5TbfkW3NCl/DqxkUxo0v2wrgdP7ifrOogdQJns8HQPrp/xpsySPPTk29MEWbWHG6RaW+aJcDzfUHLAYtHiqk46K1kYyDbYjXEk0fPi4Eb4ODol3MJnF3Ur7d7bdkxT2sAktmXvxOvwf1mHLu5+arp3ORGA8BIL8sSfI5LWbjs+EptmVJqcUNpzfGJ/7NBqt9C4nQjIUa48u93nCKhxOxFQ3Neoz7JAtdlBOBkyrtGTqDvzR46m8do8RQbBlEYrNm7+e2o+8y11KNx/Jz1e0p6Ni1uRDzyxtcWj81qPf4Yc6YfyTwAAAP//nCIVNA==" } diff --git a/x-pack/metricbeat/module/azure/storage/_meta/fields.yml b/x-pack/metricbeat/module/azure/storage/_meta/fields.yml index 0e699901c8a..1e643728890 100644 --- a/x-pack/metricbeat/module/azure/storage/_meta/fields.yml +++ b/x-pack/metricbeat/module/azure/storage/_meta/fields.yml @@ -5,3 +5,10 @@ object_type_mapping_type: "*" description: > storage account +- name: storage_account.*.* + release: ga + type: object + object_type: float + object_type_mapping_type: "*" + description: > + storage account diff --git a/x-pack/metricbeat/module/azure/storage/storage.go b/x-pack/metricbeat/module/azure/storage/storage.go index 4178b911d11..1869dea9294 100644 --- a/x-pack/metricbeat/module/azure/storage/storage.go +++ b/x-pack/metricbeat/module/azure/storage/storage.go @@ -24,6 +24,7 @@ var ( // MetricSet has been created then Fetch will begin to be called periodically. func init() { mb.Registry.MustAddMetricSet("azure", "storage", New) + mb.Registry.MustAddMetricSet("azure", "storage_account", New) } // MetricSet holds any configuration or state information. It must implement