Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398865 )
Change subject: Add Prometheus scraper configs for WDQS updater and Blazegraph
......................................................................
Add Prometheus scraper configs for WDQS updater and Blazegraph
Change-Id: Iecdcb639a2b52099a0da595c627e1cb59fa5d9dd
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 36 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index bc2b7b3..7af9500 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -578,6 +578,40 @@
port => '9198',
}
+ $wdqs_updater_jobs = [
+ {
+ 'job_name' => 'wdqs_updater',
+ 'scheme' => 'http',
+ 'file_sd_configs' => [
+ { 'files' => [ "${targets_path}/wdqs_updater_*.yaml" ]}
+ ],
+ },
+ ]
+
+ prometheus::class_config{ "wdqs_updater_${::site}":
+ dest => "${targets_path}/wdqs_updater_${::site}.yaml",
+ site => $::site,
+ class_name => 'role::wdqs',
+ port => '9194',
+ }
+
+ $blazegraph_jobs = [
+ {
+ 'job_name' => 'blazegraph',
+ 'scheme' => 'http',
+ 'file_sd_configs' => [
+ { 'files' => [ "${targets_path}/blazegraph_*.yaml" ]}
+ ],
+ },
+ ]
+
+ prometheus::class_config{ "blazegraph_${::site}":
+ dest => "${targets_path}/blazegraph_${::site}.yaml",
+ site => $::site,
+ class_name => 'role::wdqs',
+ port => '9193',
+ }
+
# redis_exporter runs alongside each redis instance, thus drop the
(uninteresting in this
# case) 'addr' and 'alias' labels
$redis_exporter_relabel = {
@@ -736,7 +770,8 @@
$apache_jobs, $etcd_jobs, $etcdmirror_jobs, $pdu_jobs,
$nginx_jobs, $pybal_jobs, $blackbox_jobs, $jmx_exporter_jobs,
$redis_jobs, $mtail_jobs, $ldap_jobs, $ircd_jobs, $pdns_rec_jobs,
- $etherpad_jobs, $elasticsearch_jobs,
+ $etherpad_jobs, $elasticsearch_jobs, $wdqs_updater_jobs,
+ $blazegraph_jobs,
),
global_config_extra => $config_extra,
}
--
To view, visit https://gerrit.wikimedia.org/r/398865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iecdcb639a2b52099a0da595c627e1cb59fa5d9dd
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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
