Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392407 )
Change subject: prometheus: fix relabeling for redis jobs
......................................................................
prometheus: fix relabeling for redis jobs
Bug: T148637
Change-Id: If1b2ca9c8fc61e4ae9a8fb3f504778c1347e623e
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index a887dce..451961e 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -527,11 +527,8 @@
# redis_exporter runs alongside each redis instance, thus drop the
(uninteresting in this
# case) 'addr' and 'alias' labels
'metric_relabel_configs' => [
- { 'source_labels' => ['addr'],
- 'action' => 'labeldrop',
- },
- { 'source_labels' => ['alias'],
- 'action' => 'labeldrop',
+ { 'regex' => '(addr|alias)',
+ 'action' => 'labeldrop',
},
],
},
--
To view, visit https://gerrit.wikimedia.org/r/392407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If1b2ca9c8fc61e4ae9a8fb3f504778c1347e623e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
