Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367362 )
Change subject: role::prometheus::hhmv_exporter: move to profile
......................................................................
role::prometheus::hhmv_exporter: move to profile
Change-Id: If9dfc3b2c080a3654865d8b5ed20ea8fb575cd1c
---
R modules/profile/manifests/prometheus/hhvm_exporter.pp
M modules/role/manifests/mediawiki/appserver.pp
M modules/role/manifests/mediawiki/appserver/api.pp
M modules/role/manifests/mediawiki/imagescaler.pp
M modules/role/manifests/mediawiki/jobrunner.pp
M modules/role/manifests/mediawiki/videoscaler.pp
6 files changed, 9 insertions(+), 10 deletions(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/prometheus/hhvm_exporter.pp
b/modules/profile/manifests/prometheus/hhvm_exporter.pp
similarity index 77%
rename from modules/role/manifests/prometheus/hhvm_exporter.pp
rename to modules/profile/manifests/prometheus/hhvm_exporter.pp
index cc9eeec..e61ff11 100644
--- a/modules/role/manifests/prometheus/hhvm_exporter.pp
+++ b/modules/profile/manifests/prometheus/hhvm_exporter.pp
@@ -1,7 +1,7 @@
-class role::prometheus::hhvm_exporter {
+class profile::prometheus::hhvm_exporter (
+ $prometheus_nodes = hiera('prometheus_nodes'),
+) {
prometheus::hhvm_exporter { 'default': }
-
- $prometheus_nodes = hiera('prometheus_nodes')
$prometheus_ferm_nodes = join($prometheus_nodes, ' ')
$ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
@@ -10,4 +10,4 @@
port => '9192',
srange => $ferm_srange,
}
-}
+}
\ No newline at end of file
diff --git a/modules/role/manifests/mediawiki/appserver.pp
b/modules/role/manifests/mediawiki/appserver.pp
index c2b4912..8168c29 100644
--- a/modules/role/manifests/mediawiki/appserver.pp
+++ b/modules/role/manifests/mediawiki/appserver.pp
@@ -4,6 +4,6 @@
include ::role::mediawiki::webserver
include ::profile::prometheus::apache_exporter
- include ::role::prometheus::hhvm_exporter
+ include ::profile::prometheus::hhvm_exporter
}
diff --git a/modules/role/manifests/mediawiki/appserver/api.pp
b/modules/role/manifests/mediawiki/appserver/api.pp
index cd7c161..445e980 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -3,7 +3,7 @@
include ::role::mediawiki::webserver
include ::profile::prometheus::apache_exporter
- include ::role::prometheus::hhvm_exporter
+ include ::profile::prometheus::hhvm_exporter
# Using fastcgi we need more local ports
sysctl::parameters { 'raise_port_range':
diff --git a/modules/role/manifests/mediawiki/imagescaler.pp
b/modules/role/manifests/mediawiki/imagescaler.pp
index c8a3ef1..c359caf 100644
--- a/modules/role/manifests/mediawiki/imagescaler.pp
+++ b/modules/role/manifests/mediawiki/imagescaler.pp
@@ -4,7 +4,7 @@
include ::role::mediawiki::scaler
include ::role::mediawiki::webserver
include ::profile::prometheus::apache_exporter
- include ::role::prometheus::hhvm_exporter
+ include ::profile::prometheus::hhvm_exporter
include ::base::firewall
}
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp
b/modules/role/manifests/mediawiki/jobrunner.pp
index b00a50f..78f2c27 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -6,8 +6,7 @@
include ::role::mediawiki::common
include ::profile::prometheus::apache_exporter
- # This should really be a profile
- include ::role::prometheus::hhvm_exporter
+ include ::profile::prometheus::hhvm_exporter
include ::profile::mediawiki::jobrunner
}
diff --git a/modules/role/manifests/mediawiki/videoscaler.pp
b/modules/role/manifests/mediawiki/videoscaler.pp
index 438cd09..62544c5 100644
--- a/modules/role/manifests/mediawiki/videoscaler.pp
+++ b/modules/role/manifests/mediawiki/videoscaler.pp
@@ -7,7 +7,7 @@
# Profiles
include ::profile::prometheus::apache_exporter
- include ::role::prometheus::hhvm_exporter
+ include ::profile::prometheus::hhvm_exporter
include ::profile::mediawiki::jobrunner
include ::base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/367362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9dfc3b2c080a3654865d8b5ed20ea8fb575cd1c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
