Merge branch '7.17' into 7.17-client

michel-laterman · Jun 17, 2024 · 2c6b178 · 2c6b178
2 parents 75d61a9 + 666c446
commit 2c6b178
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -92,7 +92,7 @@ steps:
       - label: ":ubuntu: Filebeat Go Integration Tests"
         command: |
           cd filebeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -96,7 +96,7 @@ steps:
 
           echo "~~~ Running tests"
           cd heartbeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml
@@ -72,7 +72,7 @@ steps:
         command: |
           set -euo pipefail
           cd libbeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
@@ -61,7 +61,7 @@ steps:
           echo "~~~ Running tests"
           export KUBECONFIG="$$PWD/kubecfg"
           cd metricbeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/scripts/go_int_tests.sh b/.buildkite/scripts/go_int_tests.sh
@@ -7,6 +7,6 @@ set -euo pipefail
 echo "--- Run Go Intergration Tests for $BEATS_PROJECT_NAME"
 pushd "${BEATS_PROJECT_NAME}" > /dev/null
 
-mage goIntegTest
+mage -v goIntegTest
 
 popd > /dev/null
diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
@@ -49,7 +49,7 @@ steps:
           defineModuleFromTheChangeSet x-pack/dockerlogbeat
           echo "~~~ Running tests"
           cd x-pack/dockerlogbeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -94,7 +94,7 @@ steps:
         key: "x-pack-filebeat-mandatory-int-test"
         command: |
           cd x-pack/filebeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
@@ -65,7 +65,7 @@ steps:
           npm install -g @elastic/synthetics
           echo "~~~ Running tests"
           cd x-pack/heartbeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml
@@ -72,7 +72,7 @@ steps:
         key: "mandatory-int-test"
         command: |
           cd x-pack/libbeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -56,7 +56,7 @@ steps:
           source .buildkite/scripts/changesets.sh
           defineModuleFromTheChangeSet x-pack/metricbeat
           echo "~~~ Running tests"
-          cd x-pack/metricbeat && mage goIntegTest
+          cd x-pack/metricbeat && mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -47,7 +47,7 @@ steps:
         key: "mandatory-int-test"
         command: |
           cd x-pack/osquerybeat
-          mage goIntegTest
+          mage -v goIntegTest
         retry:
           automatic:
             - limit: 3

diff --git a/metricbeat/module/kubernetes/kubernetes.yml b/metricbeat/module/kubernetes/kubernetes.yml
@@ -108,7 +108,7 @@ spec:
         requests:
           storage: 1Mi
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: basic-cronjob