From 387f2eb6760255935376cac8dc93d625c778b32a Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 26 Nov 2024 14:06:20 +0000 Subject: [PATCH 1/3] Update version.go --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 0b8ea22c50..aa1b76a77b 100644 --- a/version/version.go +++ b/version/version.go @@ -18,7 +18,7 @@ package version // name matches github.com/elastic/beats/v7/dev-tools/mage/settings.go parseBeatVersion -const defaultBeatVersion = "8.99.999" +const defaultBeatVersion = "8.100.999" // Version represents version information for a package type Version struct { From b262d485e36481370a06280f720373477d9eb0ac Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 26 Nov 2024 14:06:20 +0000 Subject: [PATCH 2/3] Update .mergify.yml --- .mergify.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 9632001295..1118bbdfa6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -352,3 +352,16 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + - name: backport patches to 8.99 branch + conditions: + - merged + - label=backport-v8.99.999 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.99" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" From fea19e0f82f4cbb52f7d27590c7570c709adeec2 Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 26 Nov 2024 14:06:20 +0000 Subject: [PATCH 3/3] Update ARM templates --- deploy/azure/ARM-for-organization-account.dev.json | 2 +- deploy/azure/ARM-for-organization-account.json | 2 +- deploy/azure/ARM-for-single-account.dev.json | 2 +- deploy/azure/ARM-for-single-account.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/azure/ARM-for-organization-account.dev.json b/deploy/azure/ARM-for-organization-account.dev.json index 1621e11b7b..cc351985b6 100644 --- a/deploy/azure/ARM-for-organization-account.dev.json +++ b/deploy/azure/ARM-for-organization-account.dev.json @@ -27,7 +27,7 @@ "metadata": { "description": "The version of elastic-agent to install" }, - "defaultValue": "9.0.0" + "defaultValue": "8.100.999" }, "FleetUrl": { "type": "string", diff --git a/deploy/azure/ARM-for-organization-account.json b/deploy/azure/ARM-for-organization-account.json index 08942e3b32..8f9dd1e41c 100644 --- a/deploy/azure/ARM-for-organization-account.json +++ b/deploy/azure/ARM-for-organization-account.json @@ -27,7 +27,7 @@ "metadata": { "description": "The version of elastic-agent to install" }, - "defaultValue": "9.0.0" + "defaultValue": "8.100.999" }, "FleetUrl": { "type": "string", diff --git a/deploy/azure/ARM-for-single-account.dev.json b/deploy/azure/ARM-for-single-account.dev.json index a8e98b16fe..85f215b27d 100644 --- a/deploy/azure/ARM-for-single-account.dev.json +++ b/deploy/azure/ARM-for-single-account.dev.json @@ -14,7 +14,7 @@ "metadata": { "description": "The version of elastic-agent to install" }, - "defaultValue": "9.0.0" + "defaultValue": "8.100.999" }, "FleetUrl": { "type": "string", diff --git a/deploy/azure/ARM-for-single-account.json b/deploy/azure/ARM-for-single-account.json index 68564ce5c9..e857b8fee1 100644 --- a/deploy/azure/ARM-for-single-account.json +++ b/deploy/azure/ARM-for-single-account.json @@ -14,7 +14,7 @@ "metadata": { "description": "The version of elastic-agent to install" }, - "defaultValue": "9.0.0" + "defaultValue": "8.100.999" }, "FleetUrl": { "type": "string",