Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398840 )
Change subject: Add rabbitmq jobs to Prometheus config for labmon
......................................................................
Add rabbitmq jobs to Prometheus config for labmon
Also extend search base; Prometheus tries to resolve unqualified
host names.
Change-Id: I3c4f305006c9f2359287d17f2324a9dd0bb8fa7e
---
A hieradata/role/common/labs/prometheus.yaml
M modules/role/manifests/labs/prometheus.pp
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Looks good to me, approved
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
diff --git a/hieradata/role/common/labs/prometheus.yaml
b/hieradata/role/common/labs/prometheus.yaml
new file mode 100644
index 0000000..b3e0545
--- /dev/null
+++ b/hieradata/role/common/labs/prometheus.yaml
@@ -0,0 +1,7 @@
+profile::base::domain_search:
+ - wikimedia.org
+ - eqiad.wmnet
+ - codfw.wmnet
+ - esams.wmnet
+ - ulsfo.wmnet
+ - eqsin.wmnet
diff --git a/modules/role/manifests/labs/prometheus.pp
b/modules/role/manifests/labs/prometheus.pp
index df8a3aa..225fb12 100644
--- a/modules/role/manifests/labs/prometheus.pp
+++ b/modules/role/manifests/labs/prometheus.pp
@@ -65,7 +65,7 @@
max_chunks_to_persist => $max_chunks_to_persist,
memory_chunks => $memory_chunks,
scrape_configs_extra => array_concat(
- $blackbox_jobs
+ $blackbox_jobs, $rabbitmq_jobs
),
}
--
To view, visit https://gerrit.wikimedia.org/r/398840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c4f305006c9f2359287d17f2324a9dd0bb8fa7e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
