From ee2eaadb9505933f84f6d852a75199709cb67999 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Sun, 24 Jul 2022 12:35:36 +0200 Subject: [PATCH 1/2] [Apache] Use new labels for license and subscription --- packages/apache/changelog.yml | 5 +++++ packages/apache/manifest.yml | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/apache/changelog.yml b/packages/apache/changelog.yml index 643198d6722d..ecf506f04bad 100644 --- a/packages/apache/changelog.yml +++ b/packages/apache/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.4.2" + changes: + - description: Use new labels for source license and subscription + type: enhancement + link: https://github.com/elastic/integrations/issues/3816 - version: "1.4.1" changes: - description: Add correct field mapping for event.created diff --git a/packages/apache/manifest.yml b/packages/apache/manifest.yml index 68cd2cad7c6f..c6933ca1c26d 100644 --- a/packages/apache/manifest.yml +++ b/packages/apache/manifest.yml @@ -1,8 +1,10 @@ format_version: 1.0.0 name: apache title: Apache HTTP Server -version: 1.4.1 +version: 1.4.2 license: basic +source: + license: Elastic-2.0 description: Collect logs and metrics from Apache servers with Elastic Agent. type: integration categories: @@ -10,6 +12,7 @@ categories: release: ga conditions: kibana.version: "^8.0.0" + elastic.subscription: basic screenshots: - src: /img/apache-metrics-overview.png title: Apache metrics overview From c93d0adb663cb4f80ac93ddab7e9fd2ac33ba380 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Mon, 25 Jul 2022 10:44:19 +0200 Subject: [PATCH 2/2] Fix version --- packages/apache/changelog.yml | 2 +- packages/apache/manifest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apache/changelog.yml b/packages/apache/changelog.yml index ecf506f04bad..1657fd8d46a9 100644 --- a/packages/apache/changelog.yml +++ b/packages/apache/changelog.yml @@ -1,5 +1,5 @@ # newer versions go on top -- version: "1.4.2" +- version: "1.5.0" changes: - description: Use new labels for source license and subscription type: enhancement diff --git a/packages/apache/manifest.yml b/packages/apache/manifest.yml index c6933ca1c26d..cf59d4d75d82 100644 --- a/packages/apache/manifest.yml +++ b/packages/apache/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: apache title: Apache HTTP Server -version: 1.4.2 +version: 1.5.0 license: basic source: license: Elastic-2.0