From cd0f0d0420278c52eed9cd525e9720a9bdfbb466 Mon Sep 17 00:00:00 2001 From: Mariana Dima Date: Mon, 2 Nov 2020 10:12:06 +0000 Subject: [PATCH 1/2] Cherry-pick #22152 to 7.10: Add interval documentation to `monitor` metricset (#22294) * Add interval documentation to `monitor` metricset (#22152) * mofidy doc * update doc * changelog * space * updaet * spelling (cherry picked from commit 231f5adc89c83f07224b495efd31af2da53a8fd1) * fix changelog --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/modules/azure.asciidoc | 2 +- x-pack/metricbeat/module/azure/_meta/docs.asciidoc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e0eba9095063..6d6f183c59fd 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -426,6 +426,7 @@ 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 interval information to `monitor` metricset in azure. {pull}22152[22152] - Remove io.time from windows {pull}22237[22237] *Packetbeat* diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc index 8ec43e4be432..08a14132e8f9 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 9065f2f283fa..78e932a01535 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 5f9bed50165643695819c69ccd600fb345e0eb6a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Nov 2020 14:18:45 +0000 Subject: [PATCH 2/2] [CI] Support Windows-8 (#22307) (#22319) --- auditbeat/Jenkinsfile.yml | 11 +++++++++++ filebeat/Jenkinsfile.yml | 11 +++++++++++ heartbeat/Jenkinsfile.yml | 11 +++++++++++ metricbeat/Jenkinsfile.yml | 11 +++++++++++ packetbeat/Jenkinsfile.yml | 11 +++++++++++ winlogbeat/Jenkinsfile.yml | 11 +++++++++++ x-pack/auditbeat/Jenkinsfile.yml | 11 +++++++++++ x-pack/elastic-agent/Jenkinsfile.yml | 11 +++++++++++ x-pack/filebeat/Jenkinsfile.yml | 11 +++++++++++ x-pack/functionbeat/Jenkinsfile.yml | 11 +++++++++++ x-pack/metricbeat/Jenkinsfile.yml | 11 +++++++++++ x-pack/packetbeat/Jenkinsfile.yml | 11 +++++++++++ x-pack/winlogbeat/Jenkinsfile.yml | 11 +++++++++++ 13 files changed, 143 insertions(+) diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 53c2707f4e01..07acc93570cf 100644 --- a/auditbeat/Jenkinsfile.yml +++ b/auditbeat/Jenkinsfile.yml @@ -81,3 +81,14 @@ stages: - "windows-10" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test auditbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml index e31dee8ccc90..25d31e2fface 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -68,4 +68,15 @@ stages: labels: - "windows-10" branches: true ## for all the branches + tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test filebeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches tags: true ## for all the tags \ No newline at end of file diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml index 8c891804a3c4..ba1b19d9215f 100644 --- a/heartbeat/Jenkinsfile.yml +++ b/heartbeat/Jenkinsfile.yml @@ -89,3 +89,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tag + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test heartbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tag diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index 5b56c6d6338b..a06e886b17db 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -74,3 +74,14 @@ stages: - "windows-10" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test metricbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index 417b0278f132..39b3682ffd04 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -89,3 +89,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test packetbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index 45834e5f2b24..f56fa84567a9 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -53,3 +53,14 @@ stages: # - "windows-10" # branches: true ## for all the branches # tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test winlogbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml index 6c14dc249ad8..fc0c153300f0 100644 --- a/x-pack/auditbeat/Jenkinsfile.yml +++ b/x-pack/auditbeat/Jenkinsfile.yml @@ -90,3 +90,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test x-pack/auditbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml index 1348b17b8259..96fdf9a435fc 100644 --- a/x-pack/elastic-agent/Jenkinsfile.yml +++ b/x-pack/elastic-agent/Jenkinsfile.yml @@ -89,3 +89,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test x-pack/elastic-agent for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml index cd42a01cbcb6..dbb262ee7e61 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -90,3 +90,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test x-pack/filebeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml index c63ed28cdf2e..785b3960686d 100644 --- a/x-pack/functionbeat/Jenkinsfile.yml +++ b/x-pack/functionbeat/Jenkinsfile.yml @@ -87,3 +87,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test x-pack/functionbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml index ed5d12dd7c75..be79daee7189 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -79,3 +79,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test x-pack/metricbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index 00a7c1c63332..c696de51e0fd 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/Jenkinsfile.yml @@ -62,3 +62,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test x-pack/packetbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/winlogbeat/Jenkinsfile.yml b/x-pack/winlogbeat/Jenkinsfile.yml index 0bb02dfbdef9..9e5cb052e107 100644 --- a/x-pack/winlogbeat/Jenkinsfile.yml +++ b/x-pack/winlogbeat/Jenkinsfile.yml @@ -62,3 +62,14 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tags + windows-8: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-8" + when: ## Override the top-level when. + comments: + - "/test x-pack/winlogbeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags