[Apache] Add condition support to logs and metrics (#7372)

* apache condition support * improve condition descriptions
elastic · Sep 4, 2023 · 8aac25c · 8aac25c
1 parent 9a3b520
commit 8aac25c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 1 deletion.
diff --git a/packages/apache/changelog.yml b/packages/apache/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.15.0"
+  changes:
+    - description: Add ability to set condition for logs and metrics.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/7372
 - version: "1.14.0"
   changes:
     - description: Enable time series data streams for the metrics datasets. This dramatically reduces storage for metrics and is expected to progressively improve query performance. For more details, see https://www.elastic.co/guide/en/elasticsearch/reference/current/tsds.html.

diff --git a/packages/apache/data_stream/access/agent/stream/log.yml.hbs b/packages/apache/data_stream/access/agent/stream/log.yml.hbs
@@ -16,4 +16,7 @@ exclude_files: [".gz$"]
 {{#if processors}}
 processors:
 {{processors}}
+{{/if}}
+{{#if condition}}
+condition: {{ condition }}
 {{/if}}
diff --git a/packages/apache/data_stream/error/agent/stream/log.yml.hbs b/packages/apache/data_stream/error/agent/stream/log.yml.hbs
@@ -17,4 +17,7 @@ processors:
 - add_locale: ~
 {{#if processors}}
 {{processors}}
+{{/if}}
+{{#if condition}}
+condition: {{ condition }}
 {{/if}}
diff --git a/packages/apache/data_stream/status/agent/stream/stream.yml.hbs b/packages/apache/data_stream/status/agent/stream/stream.yml.hbs
@@ -7,3 +7,6 @@ period: {{period}}
 {{#if server_status_path}}
 server_status_path: {{server_status_path}}
 {{/if}}
+{{#if condition}}
+condition: {{ condition }}
+{{/if}}
diff --git 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.14.0"
+version: "1.15.0"
 license: basic
 source:
   license: Elastic-2.0
@@ -36,6 +36,14 @@ policy_templates:
       - type: logfile
         title: Collect logs from Apache instances
         description: Collecting Apache access and error logs
+        vars:
+          - name: condition
+            title: Condition
+            description: Condition to filter when to collect this input. See [Dynamic Input Configuration](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html) for details.
+            type: text
+            multi: false
+            required: false
+            show_user: false
       - type: httpjson
         title: Collect logs from third-party REST API (experimental)
         description: Collect logs from third-party REST API (experimental)
@@ -107,5 +115,12 @@ policy_templates:
             show_user: true
             default:
               - http://127.0.0.1
+          - name: condition
+            title: Condition
+            description: Condition to filter when to collect this input. See [Dynamic Input Configuration](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html) for details.
+            type: text
+            multi: false
+            required: false
+            show_user: false
 owner:
   github: elastic/obs-infraobs-integrations