Skip to content

Commit 1e5ae90

Browse files
ChrsMarkma-hei
andauthored
Make use of prometheus filter settings on IBM-MQ Metricbeat module (#16971) (#17048)
(cherry picked from commit 0208a25) Co-authored-by: ma-hei <[email protected]>
1 parent 87dbd96 commit 1e5ae90

File tree

2 files changed

+5
-25
lines changed

2 files changed

+5
-25
lines changed

x-pack/metricbeat/module/ibmmq/qmgr/manifest.yml

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,7 @@ input:
44
metricset: collector
55
defaults:
66
metrics_path: /metrics
7-
8-
# The custom processor is responsible for filtering Prometheus metrics
9-
# not stricly related to the IBM MQ domain, e.g. system load, process,
10-
# metrics HTTP server.
11-
processors:
12-
- script:
13-
lang: javascript
14-
source: >
15-
function process(event) {
16-
var metrics = event.Get("prometheus.metrics");
17-
if (metrics == null) {
18-
event.Cancel();
19-
return;
20-
}
21-
Object.keys(metrics).forEach(function(key) {
22-
if (!(key.match(/^ibmmq_.*$/))) {
23-
event.Delete("prometheus.metrics." + key);
24-
}
25-
});
26-
metrics = event.Get("prometheus.metrics");
27-
if (Object.keys(metrics).length == 0) {
28-
event.Cancel();
29-
}
30-
}
7+
# Filtering out Prometheus metrics that are not strictly related to the
8+
# IBM MQ domain, e.g. system load, process, metrics HTTP server.
9+
metrics_filters:
10+
include: ["ibmmq_.*", "^up$"]

x-pack/metricbeat/module/ibmmq/test_ibmmq.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ def test_qmgr(self):
3737

3838
# Verify if processors are correctly setup.
3939
for metric in evt["prometheus"]["metrics"].keys():
40-
assert metric.startswith("ibmmq_")
40+
assert metric.startswith("ibmmq_") or metric == "up"

0 commit comments

Comments
 (0)