solve conflicts

CohenIdo · CohenIdo · commit 47fee7c6bebc · 2025-07-14T14:53:36.000+03:00
diff --git a/packages/cloud_security_posture/changelog.yml b/packages/cloud_security_posture/changelog.yml
@@ -1,9 +1,4 @@
 # newer versions go on top
-- version: "2.0.0-preview05"
-  changes:
-    - description: Update the minimum supported Kibana version for the upcoming release.
-      type: bugfix
-      link: https://github.com/elastic/integrations/pull/14530
 # version map:
 # 2.0.x - 8.19.x, 9.1.x
 # 1.13.x - 8.18.x, 9.0.x
@@ -18,6 +13,16 @@
 # 1.4.x - 8.9.x
 # 1.3.x - 8.8.x
 # 1.2.x - 8.7.x
+- version: "2.0.0-preview06"
+  changes:
+    - description: Update the minimum supported Kibana version for the upcoming release.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/14530
+- version: "2.0.0-preview05"
+  changes:
+    - description: Fix GCP ARM, Cloud Shell and Cloud Connectors version
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/14466
 - version: "2.0.0-preview04"
   changes:
     - description: Add temporary processor to remove the fields added by the Agentless policy.
diff --git a/packages/cloud_security_posture/manifest.yml b/packages/cloud_security_posture/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 3.3.2
 name: cloud_security_posture
 title: "Security Posture Management"
-version: "2.0.0-preview05"
+version: "2.0.0-preview06"
 source:
   license: "Elastic-2.0"
 description: "Identify & remediate configuration risks in your Cloud infrastructure"
@@ -143,7 +143,7 @@ policy_templates:
             description: Template URL to Cloud Formation Cloud Connectors Stack
             # ACCOUNT_TYPE value should be either "single-account" or "organization-account"
             # RESOURCE_ID is the project id for serverless / kibana component id for ess
-            default: https://console.aws.amazon.com/cloudformation/home#/stacks/quickcreate?templateURL=https://elastic-cspm-cft.s3.eu-central-1.amazonaws.com/cloudformation-cloud-connectors-ACCOUNT_TYPE-8.19.0.yml&param_ElasticResourceId=RESOURCE_ID
+            default: https://console.aws.amazon.com/cloudformation/home#/stacks/quickcreate?templateURL=https://elastic-cspm-cft.s3.eu-central-1.amazonaws.com/cloudformation-cloud-connectors-ACCOUNT_TYPE-9.1.0.yml&param_ElasticResourceId=RESOURCE_ID
       - type: cloudbeat/cis_gcp
         title: GCP
         description: CIS Benchmark for Google Cloud Platform Foundations
@@ -155,7 +155,7 @@ policy_templates:
             required: true
             show_user: false
             description: A URL to CloudShell for creating a new deployment
-            default: https://shell.cloud.google.com/cloudshell/?ephemeral=true&cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Felastic%2Fcloudbeat&cloudshell_git_branch=8.18&cloudshell_workspace=deploy%2Fdeployment-manager&show=terminal
+            default: https://shell.cloud.google.com/cloudshell/?ephemeral=true&cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Felastic%2Fcloudbeat&cloudshell_git_branch=8.19&cloudshell_workspace=deploy%2Fdeployment-manager&show=terminal
       - type: cloudbeat/cis_azure
         title: Azure
         description: CIS Benchmark for Microsoft Azure Foundations
@@ -168,7 +168,7 @@ policy_templates:
             show_user: false
             description: A URL to the ARM Template for creating a new deployment
             # ACCOUNT_TYPE value should be either "single-account" or "organization-account"
-            default: https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fcloudbeat%2F8.18%2Fdeploy%2Fazure%2FARM-for-ACCOUNT_TYPE.json
+            default: https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fcloudbeat%2F8.19%2Fdeploy%2Fazure%2FARM-for-ACCOUNT_TYPE.json
   - name: vuln_mgmt
     title: Cloud Native Vulnerability Management (CNVM)
     description: Scan for cloud workload vulnerabilities
