From 464d14ab2385094210b794294eb4b217c2086856 Mon Sep 17 00:00:00 2001
From: Marten Heidemeyer <marten_heidemeyer@web.de>
Date: Wed, 11 Mar 2020 22:38:35 -0700
Subject: [PATCH] Make use of prometheus filter settings on IBM-MQ Metricbeat
 module

---
 .../metricbeat/module/ibmmq/qmgr/manifest.yml | 28 +++----------------
 x-pack/metricbeat/module/ibmmq/test_ibmmq.py  |  2 +-
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/x-pack/metricbeat/module/ibmmq/qmgr/manifest.yml b/x-pack/metricbeat/module/ibmmq/qmgr/manifest.yml
index 21f660d8482a..df4640a96906 100644
--- a/x-pack/metricbeat/module/ibmmq/qmgr/manifest.yml
+++ b/x-pack/metricbeat/module/ibmmq/qmgr/manifest.yml
@@ -4,27 +4,7 @@ input:
   metricset: collector
   defaults:
     metrics_path: /metrics
-
-# The custom processor is responsible for filtering Prometheus metrics
-# not stricly related to the IBM MQ domain, e.g. system load, process,
-# metrics HTTP server.
-processors:
-  - script:
-      lang: javascript
-      source: >
-        function process(event) {
-          var metrics = event.Get("prometheus.metrics");
-          if (metrics == null) {
-            event.Cancel();
-            return;
-          }
-          Object.keys(metrics).forEach(function(key) {
-            if (!(key.match(/^ibmmq_.*$/))) {
-              event.Delete("prometheus.metrics." + key);
-            }
-          });
-          metrics = event.Get("prometheus.metrics");
-          if (Object.keys(metrics).length == 0) {
-            event.Cancel();
-          }
-        }
+    # Filtering out Prometheus metrics that are not strictly related to the
+    # IBM MQ domain, e.g. system load, process, metrics HTTP server.
+    metrics_filters:
+      include: ["ibmmq_.*", "^up$"]
diff --git a/x-pack/metricbeat/module/ibmmq/test_ibmmq.py b/x-pack/metricbeat/module/ibmmq/test_ibmmq.py
index 436f15aa7dba..c7e930335aab 100644
--- a/x-pack/metricbeat/module/ibmmq/test_ibmmq.py
+++ b/x-pack/metricbeat/module/ibmmq/test_ibmmq.py
@@ -37,4 +37,4 @@ def test_qmgr(self):
 
             # Verify if processors are correctly setup.
             for metric in evt["prometheus"]["metrics"].keys():
-                assert metric.startswith("ibmmq_")
+                assert metric.startswith("ibmmq_") or metric == "up"