diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e0eba909506..6d6f183c59f 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/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 4da4068bfb0..3ed44ddedf8 100644 --- a/auditbeat/Jenkinsfile.yml +++ b/auditbeat/Jenkinsfile.yml @@ -82,3 +82,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 cfe25ab79c4..658e3d60dbd 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -69,6 +69,17 @@ 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 filebeat for windows-8" + labels: + - "windows-8" + branches: true ## for all the branches + tags: true ## for all the tags windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml index af67c8a7c83..d068a7798ad 100644 --- a/heartbeat/Jenkinsfile.yml +++ b/heartbeat/Jenkinsfile.yml @@ -89,6 +89,17 @@ 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 windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index 51d9de8e93f..3d17e9c6ce2 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -75,3 +75,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/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/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index 1aee8c11a32..a75bbd3bf60 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -89,6 +89,17 @@ 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 #windows-7-32: See https://github.com/elastic/beats/issues/22303 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index 5cd9e3fd6e3..56427c4f19b 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -53,6 +53,17 @@ 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 #windows-7-32: See https://github.com/elastic/beats/issues/19829 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml index 867020da489..7e40a4047ad 100644 --- a/x-pack/auditbeat/Jenkinsfile.yml +++ b/x-pack/auditbeat/Jenkinsfile.yml @@ -90,6 +90,17 @@ 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 windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml index 787c9acf10a..890a2cbb4c4 100644 --- a/x-pack/elastic-agent/Jenkinsfile.yml +++ b/x-pack/elastic-agent/Jenkinsfile.yml @@ -89,6 +89,17 @@ 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 #windows-7-32: See https://github.com/elastic/beats/issues/22316 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml index 7ff85ddcc77..b3ef5fad8c3 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -90,6 +90,17 @@ 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 #windows-7-32: See https://github.com/elastic/beats/issues/22315 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml index 718693d7ea2..18451764289 100644 --- a/x-pack/functionbeat/Jenkinsfile.yml +++ b/x-pack/functionbeat/Jenkinsfile.yml @@ -87,6 +87,17 @@ 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 windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml index 55c6819ba60..5fe7cff4134 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -80,3 +80,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/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` diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index 9b181181d40..08f666bc43e 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/Jenkinsfile.yml @@ -62,6 +62,17 @@ 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 windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/x-pack/winlogbeat/Jenkinsfile.yml b/x-pack/winlogbeat/Jenkinsfile.yml index 964105a2ea2..405ce1aa1d4 100644 --- a/x-pack/winlogbeat/Jenkinsfile.yml +++ b/x-pack/winlogbeat/Jenkinsfile.yml @@ -62,6 +62,17 @@ 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 #windows-7-32: See https://github.com/elastic/beats/issues/19829 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage.