Filippo Giunchedi has submitted this change and it was merged.
Change subject: role: fix Prometheus global instance configuration
......................................................................
role: fix Prometheus global instance configuration
Change-Id: I708369c8ec19920c19bf16593990360d47701e3e
---
M modules/role/manifests/prometheus/global.pp
1 file changed, 12 insertions(+), 9 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/prometheus/global.pp
b/modules/role/manifests/prometheus/global.pp
index 77c3c5e..10bbe33 100644
--- a/modules/role/manifests/prometheus/global.pp
+++ b/modules/role/manifests/prometheus/global.pp
@@ -6,9 +6,10 @@
{
'job_name' => 'federate-ops',
'honor_labels' => true,
- 'metrics_path' => '/federate',
+ 'metrics_path' => '/ops/federate',
'params' => {
# Pull the union of metrics matching the following queries.
+ # Note: all regexps are implicitly anchored with ^$
'match[]' => [
# Up status for targets and exporters
'{__name__=~"up"}',
@@ -16,21 +17,23 @@
# Self-monitoring job
'{job="prometheus"}',
# Per-cluster aggregated metrics
- '{__name__=~"^cluster:"}',
- '{__name__=~"^cluster_device:"}',
+ '{__name__=~"cluster:.*"}',
+ '{__name__=~"cluster_device:.*"}',
# Version stats for auditing purposes
'{__name__="node_uname_info"}',
'{__name__="varnish_version"}',
'{__name__="mysql_version_info"}',
+ '{__name__="memcached_version"}',
],
},
'static_configs' => [
- 'targets' => [
- 'prometheus.svc.eqiad.wmnet/ops',
- 'prometheus.svc.codfw.wmnet/ops',
- 'prometheus.svc.ulsfo.wmnet/ops',
- 'prometheus.svc.esams.wmnet/ops',
- ],
+ { 'targets' => [
+ 'prometheus.svc.eqiad.wmnet',
+ 'prometheus.svc.codfw.wmnet',
+ 'prometheus.svc.ulsfo.wmnet',
+ 'prometheus.svc.esams.wmnet',
+ ],
+ },
],
},
]
--
To view, visit https://gerrit.wikimedia.org/r/322798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I708369c8ec19920c19bf16593990360d47701e3e
Gerrit-PatchSet: 1
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
