Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/302680
Change subject: Add prometheus's mysql-exporter to all jessie's core databases
......................................................................
Add prometheus's mysql-exporter to all jessie's core databases
Bug: T126757
Change-Id: I19f12a893f9da334984dc3cc40d247fbefe58e45
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/302680/1
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index f17e924..4b390c3 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -518,6 +518,10 @@
include passwords::misc::scripts
include role::mariadb::ferm
+ if os_version('debian >= jessie') {
+ include role::prometheus::mysqld_exporter
+ }
+
if ($shard == 'es1') {
$mysql_role = 'standalone'
} elsif $master == true {
diff --git a/manifests/site.pp b/manifests/site.pp
index 92ebd07..785e668 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -449,20 +449,11 @@
include base::firewall
}
-node /^db20(34|42|48|55|62|70)\.codfw\.wmnet/ {
+node /^db20(34|42|48|55|62|69|70)\.codfw\.wmnet/ {
class { 'role::mariadb::core':
shard => 's1',
binlog_format => 'ROW',
}
- include base::firewall
-}
-
-node 'db2069.codfw.wmnet' {
- class { 'role::mariadb::core':
- shard => 's1',
- binlog_format => 'ROW',
- }
- role prometheus::mysqld_exporter
include base::firewall
}
--
To view, visit https://gerrit.wikimedia.org/r/302680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19f12a893f9da334984dc3cc40d247fbefe58e45
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
