Enable setting condition on Prometheus Collector (elastic#5317)

* Enable setting condition on Prometheus Collector * Fixed missed update of manifest * exclude condition if null * Re-add lost change to condition required * Re-add leaderelection with condition * Fix leaderelection required
agithomas · Mar 21, 2023 · 1e9b197 · 1e9b197
1 parent 1bd2bed
commit 1e9b197
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/packages/prometheus/changelog.yml b/packages/prometheus/changelog.yml
@@ -1,4 +1,8 @@
-# newer versions go on top
+- version: "1.2.0"
+  changes:
+    - description: Enable setting condition on Prometheus Collector
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/5317
 - version: "1.1.0"
   changes:
     - description: Remove "integration" from the package name

diff --git a/packages/prometheus/data_stream/collector/agent/stream/stream.yml.hbs b/packages/prometheus/data_stream/collector/agent/stream/stream.yml.hbs
@@ -26,9 +26,17 @@ ssl.certificate_authorities:
 use_types: {{use_types}}
 username: {{username}}
 password: {{password}}
-{{#if leaderelection}}
+{{#if leaderelection }}
+{{#if condition }}
+condition: ${kubernetes_leaderelection.leader} == true and {{ condition }}
+{{ else }}
 condition: ${kubernetes_leaderelection.leader} == true
 {{/if}}
+{{ else }}
+{{#if condition }}
+condition: {{ condition }}
+{{/if}}
+{{/if}}
 {{#if query}}
 {{query}}
 {{/if}}

diff --git a/packages/prometheus/data_stream/collector/manifest.yml b/packages/prometheus/data_stream/collector/manifest.yml
@@ -47,6 +47,13 @@ streams:
         required: true
         show_user: true
         default: false
+      - name: condition
+        title: Condition
+        description: Condition to filter when to apply this datastream
+        type: text
+        multi: false
+        required: false
+        show_user: true
       - name: bearer_token_file
         type: text
         title: 'HTTP config options: bearer_token_file'

diff --git a/packages/prometheus/manifest.yml b/packages/prometheus/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: prometheus
 title: Prometheus
-version: 1.1.0
+version: 1.2.0
 license: basic
 description: Collect metrics from Prometheus servers with Elastic Agent.
 type: integration