Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398073 )
Change subject: Add Prometheus exporter to WDQS servers
......................................................................
Add Prometheus exporter to WDQS servers
Bug: T182773
Change-Id: I216f89566f79a6fe7637d08cbd176a2c4417e77c
---
A modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
M modules/profile/manifests/wdqs.pp
2 files changed, 21 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Gehel: Looks good to me, but someone else must approve
diff --git a/modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
b/modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
new file mode 100644
index 0000000..ed2d5ae
--- /dev/null
+++ b/modules/profile/manifests/prometheus/wdqs_updater_exporter.pp
@@ -0,0 +1,18 @@
+class profile::prometheus::wdqs_updater_exporter (
+ $prometheus_nodes = hiera('prometheus_nodes'),
+) {
+ $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
+ $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
+
+ require_package('prometheus-wdqs-updater-exporter')
+
+ service { 'prometheus-wdqs-updater-exporter':
+ ensure => running,
+ }
+
+ ferm::service { 'prometheus-wdqs-updater-exporter':
+ proto => 'tcp',
+ port => '9194',
+ srange => $ferm_srange,
+ }
+}
diff --git a/modules/profile/manifests/wdqs.pp
b/modules/profile/manifests/wdqs.pp
index 3beea68..c360556 100644
--- a/modules/profile/manifests/wdqs.pp
+++ b/modules/profile/manifests/wdqs.pp
@@ -10,6 +10,8 @@
$updater_options = hiera('profile::wdqs::updater_options'),
$nodes = hiera('profile::wdqs::nodes'),
) {
+ require ::profile::prometheus::wdqs_updater_exporter
+
$nagios_contact_group = 'admins,wdqs-admins'
# Install services - both blazegraph and the updater
@@ -58,4 +60,4 @@
class { '::wdqs::monitor::blazegraph': }
class { '::wdqs::monitor::updater': }
class { '::wdqs::monitor::services': }
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/398073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I216f89566f79a6fe7637d08cbd176a2c4417e77c
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@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
