From 3786bd079edbb6af3052bde871a2fe300b774586 Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 28 May 2024 13:44:56 +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 ae447d9ebb..b5d0ef000e 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.15.0" +const defaultBeatVersion = "8.16.0" // Version represents version information for a package type Version struct { From 86960be096823cbbee9fd58de9530d1e5509d1d6 Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 28 May 2024 13:44:56 +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 9aa4a939cb..878d9c2963 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -300,3 +300,16 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + - name: backport patches to 8.15 branch + conditions: + - merged + - label=backport-v8.15.0 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.15" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" From 5090f8fa9c25a7718a2e095cc27e0b3780902b0c Mon Sep 17 00:00:00 2001 From: Cloud Security Machine Date: Tue, 28 May 2024 13:44:57 +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 f61d33924f..0d19573739 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": "8.15.0" + "defaultValue": "8.16.0" }, "FleetUrl": { "type": "string", diff --git a/deploy/azure/ARM-for-organization-account.json b/deploy/azure/ARM-for-organization-account.json index ef56bec54a..eb403cf5d9 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": "8.15.0" + "defaultValue": "8.16.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 85c8414d12..dc00e273bb 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": "8.15.0" + "defaultValue": "8.16.0" }, "FleetUrl": { "type": "string", diff --git a/deploy/azure/ARM-for-single-account.json b/deploy/azure/ARM-for-single-account.json index 8a72fa9d53..0baa62ac97 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": "8.15.0" + "defaultValue": "8.16.0" }, "FleetUrl": { "type": "string",