Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398847 )
Change subject: Add nutcracker_exporter profile
......................................................................
Add nutcracker_exporter profile
Bug: T181995
Change-Id: Ie44705e78fd349e80556e88964c589e44057838d
---
M modules/profile/manifests/mediawiki/nutcracker.pp
M modules/profile/manifests/nutcracker.pp
M modules/profile/manifests/openstack/base/wikitech/service.pp
A modules/profile/manifests/prometheus/nutcracker_exporter.pp
M modules/role/manifests/thumbor/mediawiki.pp
5 files changed, 22 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/profile/manifests/mediawiki/nutcracker.pp
b/modules/profile/manifests/mediawiki/nutcracker.pp
index 1f885a3..eae2656 100644
--- a/modules/profile/manifests/mediawiki/nutcracker.pp
+++ b/modules/profile/manifests/mediawiki/nutcracker.pp
@@ -8,6 +8,7 @@
) {
$redis_servers = $redis_shards['sessions']
include ::passwords::redis
+ include ::profile::prometheus::nutcracker_exporter
$pools = {
'memcached' => {
diff --git a/modules/profile/manifests/nutcracker.pp
b/modules/profile/manifests/nutcracker.pp
index bb40052..5aee9c2 100644
--- a/modules/profile/manifests/nutcracker.pp
+++ b/modules/profile/manifests/nutcracker.pp
@@ -41,6 +41,7 @@
pools => $pools,
}
+ include ::profile::prometheus::nutcracker_exporter
class { '::nutcracker::monitoring':
port => $monitor_port,
}
diff --git a/modules/profile/manifests/openstack/base/wikitech/service.pp
b/modules/profile/manifests/openstack/base/wikitech/service.pp
index ae51f73..0493042 100644
--- a/modules/profile/manifests/openstack/base/wikitech/service.pp
+++ b/modules/profile/manifests/openstack/base/wikitech/service.pp
@@ -8,6 +8,7 @@
) {
include ::nutcracker::monitoring
+ include ::profile::prometheus::nutcracker_exporter
include ::mediawiki::packages::php5
include ::mediawiki::packages::math
include ::mediawiki::packages::tex
diff --git a/modules/profile/manifests/prometheus/nutcracker_exporter.pp
b/modules/profile/manifests/prometheus/nutcracker_exporter.pp
new file mode 100644
index 0000000..2530548
--- /dev/null
+++ b/modules/profile/manifests/prometheus/nutcracker_exporter.pp
@@ -0,0 +1,18 @@
+class profile::prometheus::nutcracker_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-nutcracker-exporter')
+
+ service { 'prometheus-nutcracker-exporter':
+ ensure => running,
+ }
+
+ ferm::service { 'prometheus-nutcracker-exporter':
+ proto => 'tcp',
+ port => '9191',
+ srange => $ferm_srange,
+ }
+}
diff --git a/modules/role/manifests/thumbor/mediawiki.pp
b/modules/role/manifests/thumbor/mediawiki.pp
index 2cfb847..6214b4c 100644
--- a/modules/role/manifests/thumbor/mediawiki.pp
+++ b/modules/role/manifests/thumbor/mediawiki.pp
@@ -9,6 +9,7 @@
include ::base::firewall
include ::mediawiki::packages::fonts
include role::statsite
+ include ::profile::prometheus::nutcracker_exporter
class { '::thumbor::nutcracker':
thumbor_memcached_servers =>
hiera('thumbor_memcached_servers_nutcracker')
--
To view, visit https://gerrit.wikimedia.org/r/398847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie44705e78fd349e80556e88964c589e44057838d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
