From 13ddd0353552985894de49082fd2b667cc741b59 Mon Sep 17 00:00:00 2001 From: Mariana Dima Date: Thu, 29 Oct 2020 15:07:48 +0000 Subject: [PATCH 1/2] Add interval documentation to `monitor` metricset (#22152) * mofidy doc * update doc * changelog * space * updaet * spelling (cherry picked from commit 231f5adc89c83f07224b495efd31af2da53a8fd1) --- CHANGELOG.next.asciidoc | 2 ++ metricbeat/docs/modules/azure.asciidoc | 2 +- x-pack/metricbeat/module/azure/_meta/docs.asciidoc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 6f5a7a7baea..522c8259b89 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -426,6 +426,8 @@ field. You can revert this change by configuring tags for the module and omittin - Fix panic in kubernetes autodiscover related to keystores {issue}21843[21843] {pull}21880[21880] - [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* diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc index 8ec43e4be43..08a14132e8f 100644 --- a/metricbeat/docs/modules/azure.asciidoc +++ b/metricbeat/docs/modules/azure.asciidoc @@ -97,7 +97,7 @@ https://login.microsoftonline.de for azure USGovernmentCloud [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 9065f2f283f..78e932a0153 100644 --- a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc @@ -89,7 +89,7 @@ https://login.microsoftonline.de for azure USGovernmentCloud [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 ee808eee004386458896354de5903b3475863c40 Mon Sep 17 00:00:00 2001 From: Mariana Date: Fri, 30 Oct 2020 10:43:54 +0100 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 522c8259b89..70a97ae3075 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -426,7 +426,6 @@ field. You can revert this change by configuring tags for the module and omittin - Fix panic in kubernetes autodiscover related to keystores {issue}21843[21843] {pull}21880[21880] - [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*