From 938e66ccf352e2925b99fc988b28c46fc3ee304e Mon Sep 17 00:00:00 2001 From: Mariana Date: Thu, 23 Jul 2020 11:01:08 +0200 Subject: [PATCH 1/6] mofidy doc --- .../module/azure/app_insights/_meta/docs.asciidoc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/x-pack/metricbeat/module/azure/app_insights/_meta/docs.asciidoc b/x-pack/metricbeat/module/azure/app_insights/_meta/docs.asciidoc index 2ba1150078b..2b587acbbdd 100644 --- a/x-pack/metricbeat/module/azure/app_insights/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/azure/app_insights/_meta/docs.asciidoc @@ -45,17 +45,15 @@ This value is only valid when segment is specified. `filter`:: (_string_) An expression used to filter the results. This value should be a valid OData filter expression where the keys of each clause should be applicable dimensions for the metric you are retrieving. -Users can select the options to retrieve all metrics from a specific namespace using the following: +Example configuration: ["source","yaml"] ---- - metrics: - - id: ["*"] - timespan: "Microsoft.Storage/storageAccounts" +metrics: + - id: ["requests/count", "requests/failed"] + segment: "request/name" + aggregation: ["sum"] ---- -A default non configurable timegrain of 5 min is set so users are advised to configure an interval of 300s or a multiply of it. - - From cf659704cbeaf201b17e9650b843c6f4a2e6264c Mon Sep 17 00:00:00 2001 From: Mariana Date: Mon, 26 Oct 2020 15:35:15 +0100 Subject: [PATCH 2/6] update doc --- metricbeat/docs/modules/azure.asciidoc | 3 ++- x-pack/metricbeat/module/azure/_meta/docs.asciidoc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc index 42d4d619c02..a61ce421909 100644 --- a/metricbeat/docs/modules/azure.asciidoc +++ b/metricbeat/docs/modules/azure.asciidoc @@ -78,7 +78,8 @@ Users can use the azure credentials keys if configured `AZURE_CLIENT_ID`, `AZURE [float] === `monitor` This metricset allows users to retrieve metrics from specified resources. Added filters can apply here as the interval of retrieving these metrics, metric names, -aggregation list, namespaces and metric dimensions. +aggregation list, namespaces and metric dimensions. The monitor metrics will have a minimum timegrain of 5 minutes, +so the `period` for `monitor` metricset should be `300s` or multiples of `300s`. [float] === `compute_vm` diff --git a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc index 01f6389ab93..cad45cd6d39 100644 --- a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc @@ -70,7 +70,8 @@ Users can use the azure credentials keys if configured `AZURE_CLIENT_ID`, `AZURE [float] === `monitor` This metricset allows users to retrieve metrics from specified resources. Added filters can apply here as the interval of retrieving these metrics, metric names, -aggregation list, namespaces and metric dimensions. +aggregation list, namespaces and metric dimensions. The monitor metrics will have a minimum timegrain of 5 minutes, +so the `period` for `monitor` metricset should be `300s` or multiples of `300s`. [float] === `compute_vm` From 8215ab830daf1e47d787842503f401eb092d50da Mon Sep 17 00:00:00 2001 From: Mariana Date: Mon, 26 Oct 2020 15:38:39 +0100 Subject: [PATCH 3/6] changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 1bf2cc8f762..8bf37800771 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -381,6 +381,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - [Kubernetes] Remove redundant dockersock volume mount {pull}22009[22009] - Revert change to report `process.memory.rss` as `process.memory.wss` on Windows. {pull}22055[22055] - Add a switch to the driver definition on SQL module to use pretty names {pull}17378[17378] +- Add interval information to `monitor` metricset in azure. {pull}22152[22152] *Packetbeat* From a91773e56ade825ef21db22cf0a8bff5a658d130 Mon Sep 17 00:00:00 2001 From: Mariana Date: Wed, 28 Oct 2020 14:06:27 +0100 Subject: [PATCH 4/6] space --- metricbeat/docs/modules/azure.asciidoc | 3 +-- x-pack/metricbeat/module/azure/_meta/docs.asciidoc | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc index a61ce421909..9187641ca62 100644 --- a/metricbeat/docs/modules/azure.asciidoc +++ b/metricbeat/docs/modules/azure.asciidoc @@ -78,8 +78,7 @@ Users can use the azure credentials keys if configured `AZURE_CLIENT_ID`, `AZURE [float] === `monitor` This metricset allows users to retrieve metrics from specified resources. Added filters can apply here as the interval of retrieving these metrics, metric names, -aggregation list, namespaces and metric dimensions. The monitor metrics will have a minimum timegrain of 5 minutes, -so the `period` for `monitor` metricset should be `300s` or multiples of `300s`. +aggregation list, namespaces and metric dimensions. The monitor metrics will have a minimum timegrain of 5 minutes, so the `period` for `monitor` metricset should be `300s` or multiples of `300s`. [float] === `compute_vm` diff --git a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc index cad45cd6d39..8e04cf6ed58 100644 --- a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc @@ -70,8 +70,7 @@ Users can use the azure credentials keys if configured `AZURE_CLIENT_ID`, `AZURE [float] === `monitor` This metricset allows users to retrieve metrics from specified resources. Added filters can apply here as the interval of retrieving these metrics, metric names, -aggregation list, namespaces and metric dimensions. The monitor metrics will have a minimum timegrain of 5 minutes, -so the `period` for `monitor` metricset should be `300s` or multiples of `300s`. +aggregation list, namespaces and metric dimensions. The monitor metrics will have a minimum timegrain of 5 minutes, so the `period` for `monitor` metricset should be `300s` or multiples of `300s`. [float] === `compute_vm` @@ -89,7 +88,7 @@ This metricset will collect metrics from the storage accounts, these metrics wil so the `period` for `storage` metricset should be `300s` or multiples of `300s`. [float] -=== `container_instance` +=== `container_instance`a This metricset will collect metrics from specified container groups, these metrics will have a timegrain every 5 minutes, so the `period` for `container_instance` metricset should be `300s` or multiples of `300s`. From 1ee215fa0334725f13d00daf386ecdfea647397e Mon Sep 17 00:00:00 2001 From: Mariana Date: Wed, 28 Oct 2020 14:36:37 +0100 Subject: [PATCH 5/6] updaet --- metricbeat/docs/modules/azure.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc index 9187641ca62..f3bef51eb04 100644 --- a/metricbeat/docs/modules/azure.asciidoc +++ b/metricbeat/docs/modules/azure.asciidoc @@ -96,7 +96,7 @@ This metricset will collect metrics from the storage accounts, these metrics wil so the `period` for `storage` metricset should be `300s` or multiples of `300s`. [float] -=== `container_instance` +=== `container_instance`a This metricset will collect metrics from specified container groups, these metrics will have a timegrain every 5 minutes, so the `period` for `container_instance` metricset should be `300s` or multiples of `300s`. From 44f29b4b2bb5ffcaf499ea662460b20517d16ef8 Mon Sep 17 00:00:00 2001 From: Mariana Date: Thu, 29 Oct 2020 15:27:37 +0100 Subject: [PATCH 6/6] spelling --- metricbeat/docs/modules/azure.asciidoc | 2 +- x-pack/metricbeat/module/azure/_meta/docs.asciidoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc index f3bef51eb04..9187641ca62 100644 --- a/metricbeat/docs/modules/azure.asciidoc +++ b/metricbeat/docs/modules/azure.asciidoc @@ -96,7 +96,7 @@ This metricset will collect metrics from the storage accounts, these metrics wil so the `period` for `storage` metricset should be `300s` or multiples of `300s`. [float] -=== `container_instance`a +=== `container_instance` This metricset will collect metrics from specified container groups, these metrics will have a timegrain every 5 minutes, so the `period` for `container_instance` metricset should be `300s` or multiples of `300s`. diff --git a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc index 8e04cf6ed58..e040fbdad22 100644 --- a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc @@ -88,7 +88,7 @@ This metricset will collect metrics from the storage accounts, these metrics wil so the `period` for `storage` metricset should be `300s` or multiples of `300s`. [float] -=== `container_instance`a +=== `container_instance` This metricset will collect metrics from specified container groups, these metrics will have a timegrain every 5 minutes, so the `period` for `container_instance` metricset should be `300s` or multiples of `300s`.