From 4f2fe2321c118839bc50d61ae1e2e2ca7e61a8e6 Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 26 Nov 2024 14:03:37 +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 e4494c88b6..52f2192b2e 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 = "9.0.0" +const defaultBeatVersion = "9.1.0" // Version represents version information for a package type Version struct { From aa73278814de8f395ccd2e6a060df0d8f2324192 Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 26 Nov 2024 14:03:37 +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..92e5e9af40 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 9.0 branch + conditions: + - merged + - label=backport-v9.0.0 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "9.0" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" From f0ed93141591fc7366d3cd0b3f67033ad883df46 Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 26 Nov 2024 14:03:38 +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..a8f91f88cf 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": "9.1.0" }, "FleetUrl": { "type": "string", diff --git a/deploy/azure/ARM-for-organization-account.json b/deploy/azure/ARM-for-organization-account.json index 08942e3b32..61ec3ae846 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": "9.1.0" }, "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..a4af35017a 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": "9.1.0" }, "FleetUrl": { "type": "string", diff --git a/deploy/azure/ARM-for-single-account.json b/deploy/azure/ARM-for-single-account.json index 68564ce5c9..fac563e6a0 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": "9.1.0" }, "FleetUrl": { "type": "string",