From 1ca175cf31c2996c04b4f80734f5cd9a181f3899 Mon Sep 17 00:00:00 2001 From: Mariana Dima Date: Mon, 7 Sep 2020 10:04:35 +0200 Subject: [PATCH 1/2] Update fields.yml in azure module (#20918) * mofidy doc * fix * generate json * changelog * fields * test * update fields (cherry picked from commit 7ca9ebec152e26681e46abf6cde4fa47e6e57aee) --- CHANGELOG.next.asciidoc | 2 ++ metricbeat/docs/fields.asciidoc | 21 +++++++++---------- .../metricbeat/module/azure/_meta/fields.yml | 6 ++++++ x-pack/metricbeat/module/azure/fields.go | 2 +- .../module/azure/monitor/_meta/fields.yml | 7 +------ 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index fc71c3a5d3f..972d938afbd 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -383,6 +383,8 @@ field. You can revert this change by configuring tags for the module and omittin - Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680] - Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736] - Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680] +- Update fields.yml in the azure module, missing metrics field. {pull}20918[20918] +- The `elasticsearch/index` metricset only requests wildcard expansion for hidden indices if the monitored Elasticsearch cluster supports it. {pull}20938[20938] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index be2602cd95a..aec3406beb4 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -4516,6 +4516,16 @@ type: keyword Azure metric dimensions. +type: object + +-- + +*`azure.metrics.*.*`*:: ++ +-- +Metrics returned. + + type: object -- @@ -4750,17 +4760,6 @@ type: object monitor - -*`azure.monitor.metrics.*.*`*:: -+ --- -Metrics returned. - - -type: object - --- - *`azure.storage.*.*`*:: + -- diff --git a/x-pack/metricbeat/module/azure/_meta/fields.yml b/x-pack/metricbeat/module/azure/_meta/fields.yml index f24d54bcd7f..c6471dc108d 100644 --- a/x-pack/metricbeat/module/azure/_meta/fields.yml +++ b/x-pack/metricbeat/module/azure/_meta/fields.yml @@ -45,3 +45,9 @@ object_type_mapping_type: "*" description: > Azure metric dimensions. + - name: metrics.*.* + type: object + object_type: float + object_type_mapping_type: "*" + description: > + Metrics returned. diff --git a/x-pack/metricbeat/module/azure/fields.go b/x-pack/metricbeat/module/azure/fields.go index 1c8cd1527b4..4c0ad95ad98 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 gzipped contents of module/azure. func AssetAzure() string { - return "eJzUV71u2zAQ3v0UB48BkgfwUCBolw7dugtn8qywkUiCPKV1n77QD2lKlGWnVgDHQ4CI5Pej+3ikHuGVjjvAv42jDQArrmgH2+f2/+0GQJIXTllWRu/gywYA+rlQG9lU7RJHFaGnHZS4ATgoqqTfdRMfQWNNJ/D2x0fbTnWmscOTGYYxTArFqqbSodJxJEC+0vG3cTJ5Pgvc/36+EDz3NoidEjO4gdGRN40TlBGmHq6gCzjgLQl1UJRKndodWT5aGg2cd3xBRpDSLgdzAE5kzVJPLa7AHV9Djh0NY+mfHmZpzf4XCZ4M9Q+LJWHJlKJGa5Uuh/nbh+37TPSxiTY6sVlo2r/e4kxq3h3TCAWeKhKc5Caw+WYfIQolb+dMAeH7t4xQqpq0V0aP63SmRhfqc21tFjSPtnIiLhOO1hZKe1W+sL+4oWNj2xPjdULQ2koJ7N7bDM/SNk+Wjmu4VMcLckI9U1lJOVN6z+i4kMjzvWZm4AreDjRfGzhJy7UZScvzfH1A/NPDf3eXQ2VwYcKNvaU1MGjMkrtXVaV0+RGhHaABtYTGY0kgiVFV1yZXNM6RFsd1MzuLGiitI8Y/hTB+Wo3zdbrA+XWKFZsdWXRck+aifbCuyxM4ZOAns0Y2WS5vJB5A89tFYO2SUHQ7eMX92efrQl/oqUnPd8FbiBfbw7APCktOGbl6Ew7brIeHCXw8BoQwzYdELW7znuF83lBwg9Wqm6s7hDpYyGAD7cE4Euh5deIAfJ66D9zKR9HQStO1sWOa2jZMxVs9OYvG31JjFcv3qum7WeFWdVK5YKDwAivyxJ/DSZQbx2e8aUalybU3RUYt6L6tDWohqF0w5KhUnt3xcxgKahcMeXJv6rMUaBCbf00h4x49FUNnvmc3QWs4RTIztdGKjbv+nlpeeUvNgZfupPd+1YcfvUBwxI3TJJ/ONyTPxmF51yEfJMZU/AsAAP//G9NOsw==" + return "eJzUV8tu2zoQ3fsrBl4GSD7AiwsEt5suuuteGJNjhY1EEuQorfv1hR6kKVHyo1aKxIsAEcnzEM8MqUd4peMO8HfjaAPAiivawfa5/X+7AZDkhVOWldE7+G8DAP1cqI1sqnaJo4rQ0w5K3AAcFFXS77qJj6CxphN4++Ojbac609jhyQzDGCaFYlVT6VDpOBIgX+n40ziZPJ8F7n/fXwieexvETokZ3MDoyJvGCcoIUw9X0AUc8JaEOihKpU7tjiwfLY0Glh1fkBGktMvBHIATWbPUU4srcMfXkGNHw1j6p4dZWrP/QYInQ/3D4pywZEpRo7VKl8P87cP2NhN9bKKNTmwWmvavtziTmptjGqHAU0WCk9wENt/sI0Sh5P2cKSB8/ZIRSlWT9sro8T4t7NGF/bl2b85oHpVyIi4T3k/xTw836z5UBhcG/1b1t14MOOLGaZK5XLS2UNqr8oX9xf4T+/CeGK9TgNZWSmC3zTM857pSsnQcObi/R6SykvSl9J7RcSGR51vjzMAVvB1ovjZwkpZrM5KWy3zzYYUbmuE0tLBqK2wNDBqz5O5VVSldvkdoB2hALaHxWBJIYlTVtckVjXOkxXHdzM6iBkrriPFXIYyf7sbyPl3g/H+KFXszWXRck+aifbCuyxM4ZOAns0Y2WS7vJB5A88tQYO2SUHQVvGJ99vm60Bd6atLzXfAe4rPtYaiDwpJTRq7ehEOZ9fAwgY/HgBCmeZeoxTLvGZbzhoIbrFYtru4Q6mAhgw20B+NIoOfViQPwMnUfuJWPoqGVpmtjxzS1bZiKt3pyFo0//cYq/vl16qTyjIHCC6zIE38OJ1FuHJ/xphmVJtfeFBm1oI9tbVALQe0ZQ45K5dkdP4ehoPaMIU/uTX2WDRrE5h9/yLhHT8XQmT+ym6A1nCL5B6HRio27/p5aXnlLzYGnd9LlkvZsHJYfOiaDxPhe/wQAAP//ZxBMvQ==" } diff --git a/x-pack/metricbeat/module/azure/monitor/_meta/fields.yml b/x-pack/metricbeat/module/azure/monitor/_meta/fields.yml index 139b2c38047..a6288fef7f7 100644 --- a/x-pack/metricbeat/module/azure/monitor/_meta/fields.yml +++ b/x-pack/metricbeat/module/azure/monitor/_meta/fields.yml @@ -4,10 +4,5 @@ description: > monitor fields: - - name: metrics.*.* - type: object - object_type: float - object_type_mapping_type: "*" - description: > - Metrics returned. + From 4af20507aab0b7c3f0aea318584fed17dcdb5f00 Mon Sep 17 00:00:00 2001 From: Mariana Date: Tue, 8 Sep 2020 09:51:20 +0200 Subject: [PATCH 2/2] fix changelog --- CHANGELOG.next.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 972d938afbd..3b2dd011f5a 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -384,7 +384,6 @@ field. You can revert this change by configuring tags for the module and omittin - Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736] - Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680] - Update fields.yml in the azure module, missing metrics field. {pull}20918[20918] -- The `elasticsearch/index` metricset only requests wildcard expansion for hidden indices if the monitored Elasticsearch cluster supports it. {pull}20938[20938] *Packetbeat*