Merge branch 'main' into ast-inv-azure-storage

elastic · Oct 17, 2024 · af681a7 · af681a7
2 parents 141a475 + 4015c3d
commit af681a7
Show file tree

Hide file tree

Showing 41 changed files with 249 additions and 299 deletions.
diff --git a/.github/workflows/test-environment.yml b/.github/workflows/test-environment.yml
@@ -183,12 +183,6 @@ jobs:
         run: |
           # Extract the stack version
           stack_version="${{ inputs.elk-stack-version }}"
-          is_serverless_mode="${{ inputs.serverless_mode }}"
-          if [[ $is_serverless_mode == "true" ]]; then
-            # Stack version is not relevant for serverless deployments
-            # Therefore, we set it to the latest snapshot version
-            stack_version="${{ env.ELK_VERSION }}"
-          fi
 
           echo "TF_VAR_stack_version=$stack_version" >> $GITHUB_ENV
           echo "STACK_VERSION=$stack_version" >> $GITHUB_ENV

diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Init Hermit
         run: ./bin/hermit env -r >> $GITHUB_ENV
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@6b8881a17fc8038e884ec94ff72a49e8e8a4069f # v0.76.1
+        uses: updatecli/updatecli-action@92a13b95c2cd9f1c6742c965509203c6a5635ed7 # v0.76.1
       - name: Run Updatecli in Apply mode
         run: updatecli apply --config .ci/updatecli/updatecli.d/update-${{ matrix.pipeline-name }}.yml --values .ci/updatecli/values.yml
         env:
@@ -84,7 +84,7 @@ jobs:
 
           echo "GIT_BRANCH=$branchName" >> $GITHUB_ENV
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@6b8881a17fc8038e884ec94ff72a49e8e8a4069f # v0.76.1
+        uses: updatecli/updatecli-action@92a13b95c2cd9f1c6742c965509203c6a5635ed7 # v0.76.1
       - name: Run Updatecli in Apply mode
         run: updatecli apply --config .ci/updatecli/updatecli.d/update-${{ matrix.pipeline-name }}.yml --values .ci/updatecli/values.yml
         env:

diff --git a/.github/workflows/weekly-serverless.yml b/.github/workflows/weekly-serverless.yml
@@ -30,7 +30,7 @@ jobs:
       deployment_name: ${{ needs.naming.outputs.deployment_name }}
       # For now, the region is not used because it's overridden in the tf, but it's here for future compatibility.
       ess-region: "aws-us-east-1"
-      elk-stack-version: 8.12.0
+      elk-stack-version: 8.15.3
       serverless_mode: true
       run-sanity-tests: true
       expiration_days: 0
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.23.1
+1.23.2
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,5 +1,6 @@
 queue_rules:
   - name: default
+    merge_method: squash
     conditions:
       - check-success=Cloudbeat-CI / Integration Tests (pull_request)
       - check-success=Cloudbeat-CI / Build (pull_request)
@@ -93,7 +94,6 @@ pull_request_rules:
       - "#approved-reviews-by>=1"
     actions:
       queue:
-        method: squash
         name: default
   - name: delete upstream branch with changes on ^.mergify.yml that has been merged or closed
     conditions:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ exclude: (bin/(activate-)?hermit)|(scripts/make/gimme/.*)
 repos:
   ## General
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-merge-conflict
       - id: check-added-large-files
@@ -42,7 +42,7 @@ repos:
         files: ^(.ci/scripts|.github/actions|tests)/
 
   - repo: https://github.com/pycqa/pylint
-    rev: v3.3.0
+    rev: v3.3.1
     hooks:
       - id: pylint
         args: [
@@ -77,7 +77,7 @@ repos:
         files: deploy/cloudformation/.*yml
 
   - repo: https://github.com/aws-cloudformation/cfn-lint
-    rev: v1.14.2
+    rev: v1.16.0
     hooks:
       - id: cfn-python-lint
         files: deploy/cloudformation/.*.yml
@@ -170,14 +170,15 @@ repos:
         files: (\.rego)$
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.42.0
     hooks:
       - id: markdownlint
         args: [ '--disable',
                 MD013,  # Line length can be ignored for now
                 MD033,  # Allow inline HTML
                 MD046,  # Allow code blocks to be fenced with backticks
                 MD041,  # Allow multiple top level headers
+                MD058,  # Allow tables without blank lines around
                 '--' ]
         # TODO: Apply makrdownlint in other files
         files: security-policies/.*\.(md|markdown)$

diff --git a/bin/.gcloud-493.0.0.pkg → bin/.gcloud-495.0.0.pkg b/bin/.gcloud-493.0.0.pkg → bin/.gcloud-495.0.0.pkg
diff --git a/bin/.gh-2.57.0.pkg → bin/.gh-2.58.0.pkg b/bin/.gh-2.57.0.pkg → bin/.gh-2.58.0.pkg
diff --git a/bin/.go-1.23.1.pkg → bin/.go-1.23.2.pkg b/bin/.go-1.23.1.pkg → bin/.go-1.23.2.pkg
diff --git a/bin/.just-1.35.0.pkg → bin/.just-1.36.0.pkg b/bin/.just-1.35.0.pkg → bin/.just-1.36.0.pkg
diff --git a/bin/.opa-0.68.0.pkg → bin/.opa-0.69.0.pkg b/bin/.opa-0.68.0.pkg → bin/.opa-0.69.0.pkg
diff --git a/bin/.pre-commit-3.8.0.pkg → bin/.pre-commit-4.0.0.pkg b/bin/.pre-commit-3.8.0.pkg → bin/.pre-commit-4.0.0.pkg
diff --git a/bin/bq b/bin/bq
@@ -1 +1 @@
-.gcloud-493.0.0.pkg
+.gcloud-495.0.0.pkg
diff --git a/bin/docker-credential-gcloud b/bin/docker-credential-gcloud
@@ -1 +1 @@
-.gcloud-493.0.0.pkg
+.gcloud-495.0.0.pkg
diff --git a/bin/gcloud b/bin/gcloud
@@ -1 +1 @@
-.gcloud-493.0.0.pkg
+.gcloud-495.0.0.pkg
diff --git a/bin/gh b/bin/gh
@@ -1 +1 @@
-.gh-2.57.0.pkg
+.gh-2.58.0.pkg
diff --git a/bin/git-credential-gcloud.sh b/bin/git-credential-gcloud.sh
@@ -1 +1 @@
-.gcloud-493.0.0.pkg
+.gcloud-495.0.0.pkg
diff --git a/bin/go b/bin/go
@@ -1 +1 @@
-.go-1.23.1.pkg
+.go-1.23.2.pkg
diff --git a/bin/gofmt b/bin/gofmt
@@ -1 +1 @@
-.go-1.23.1.pkg
+.go-1.23.2.pkg
diff --git a/bin/gsutil b/bin/gsutil
@@ -1 +1 @@
-.gcloud-493.0.0.pkg
+.gcloud-495.0.0.pkg
diff --git a/bin/just b/bin/just
@@ -1 +1 @@
-.just-1.35.0.pkg
+.just-1.36.0.pkg
diff --git a/bin/opa b/bin/opa
@@ -1 +1 @@
-.opa-0.68.0.pkg
+.opa-0.69.0.pkg
diff --git a/bin/pre-commit b/bin/pre-commit
@@ -1 +1 @@
-.pre-commit-3.8.0.pkg
+.pre-commit-4.0.0.pkg
diff --git a/deploy/azure/install_agent_az_cli.sh b/deploy/azure/install_agent_az_cli.sh
@@ -33,11 +33,17 @@
 # Exit immediately if a command exits with a non-zero status, print each command before executing it, and fail pipelines if any command fails.
 set -euo pipefail
 
+# Extract major and minor versions
+MAJOR_VERSION=$(echo "${STACK_VERSION}" | cut -d'.' -f1)
 MINOR_VERSION=$(echo "${STACK_VERSION}" | cut -d'.' -f2)
-# Check if minor version is less than 12, ie. 8.11 and below
-if ((MINOR_VERSION < 12)); then
-    echo "Versions 8.11 and below are not supported. Please use versions 8.12+"
-    exit 0
+
+# Check for unsupported versions
+if [[ "$MAJOR_VERSION" -eq 8 && "$MINOR_VERSION" -lt 12 ]]; then
+    echo "Versions 8.11 and below are not supported. Please use versions 8.12+."
+    exit 1
+elif [[ "$MAJOR_VERSION" -lt 8 ]]; then
+    echo "Unsupported version: ${STACK_VERSION}. Please use versions 8.12+ or 9.x.x and above."
+    exit 1
 fi
 
 # Create a resource group with the name DEPLOYMENT_NAME

diff --git a/docs/version.asciidoc b/docs/version.asciidoc
@@ -1,6 +1,6 @@
 // doc-branch can be: master, 8.1, 8.2, etc.
 :doc-branch: master
-:go-version: 1.23.1
+:go-version: 1.23.2
 :python: 3.7
 :docker: 1.12
 :docker-compose: 1.11