Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189907
Change subject: clean up basic monitoring checks for all mariadb roles
......................................................................
clean up basic monitoring checks for all mariadb roles
Change-Id: Ic166a6eba156da8ea3960b2172ca46f00a208a2e
---
M manifests/role/mariadb.pp
1 file changed, 31 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/189907/1
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 41d60f4..68f2490 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -30,6 +30,25 @@
}
}
+# Annoy people in #wikimedia-operations
+class role::mariadb::monitor {
+
+ class { 'mariadb::monitor_disk':
+ contact_group => 'admins',
+ }
+
+ class { 'mariadb::monitor_process':
+ contact_group => 'admins',
+ }
+}
+
+# Annoy Sean
+class role::mariadb::monitor::dba {
+
+ include mariadb::monitor_disk
+ include mariadb::monitor_process
+}
+
# miscellaneous services clusters
class role::mariadb::misc(
$shard
@@ -41,6 +60,7 @@
include standard
include role::mariadb::grants
+ include role::mariadb::monitor
include passwords::misc::scripts
class { 'mariadb::packages_wmf':
@@ -53,14 +73,6 @@
password => $passwords::misc::scripts::mysql_root_pass,
datadir => '/srv/sqldata',
tmpdir => '/srv/tmp',
- }
-
- class { 'mariadb::monitor_disk':
- contact_group => 'admins',
- }
-
- class { 'mariadb::monitor_process':
- contact_group => 'admins',
}
}
@@ -80,6 +92,7 @@
include standard
include mariadb::packages_wmf
include role::mariadb::grants
+ include role::mariadb::monitor
include passwords::misc::scripts
$read_only = $master ? {
@@ -99,14 +112,6 @@
if $snapshot {
include coredb_mysql::snapshot
- }
-
- class { 'mariadb::monitor_disk':
- contact_group => 'admins',
- }
-
- class { 'mariadb::monitor_process':
- contact_group => 'admins',
}
unless $master {
@@ -150,6 +155,7 @@
include standard
include role::mariadb::grants
+ include role::mariadb::monitor::dba
include passwords::misc::scripts
class { 'mariadb::config':
@@ -159,9 +165,6 @@
datadir => '/a/sqldata',
tmpdir => '/a/tmp',
}
-
- include mariadb::monitor_disk
- include mariadb::monitor_process
}
# MariaDB 10 slaves replicating all shards
@@ -181,6 +184,7 @@
include standard
include role::mariadb::grants
+ include role::mariadb::monitor::dba
include passwords::misc::scripts
class { 'mariadb::config':
@@ -190,9 +194,6 @@
datadir => '/srv/sqldata',
tmpdir => '/srv/tmp',
}
-
- include mariadb::monitor_disk
- include mariadb::monitor_process
mariadb::monitor_replication {
['s1','s2','s3','s4','s5','s6','s7','m2','m3']:
lag_warn => $lag_warn,
@@ -214,6 +215,7 @@
include standard
include role::mariadb::grants
+ include role::mariadb::monitor
include passwords::misc::scripts
class { 'mariadb::config':
@@ -223,9 +225,6 @@
datadir => '/a/sqldata',
tmpdir => '/a/tmp',
}
-
- include mariadb::monitor_disk
- include mariadb::monitor_process
mariadb::monitor_replication { ['s1','s2','m2']: }
}
@@ -290,6 +289,7 @@
include standard
include role::mariadb::grants
include role::mariadb::grants::core
+ include role::mariadb::monitor
include passwords::misc::scripts
class { 'mariadb::packages_wmf':
@@ -303,9 +303,6 @@
datadir => '/srv/sqldata',
tmpdir => '/srv/tmp',
}
-
- include mariadb::monitor_disk
- include mariadb::monitor_process
mariadb::monitor_replication { [ $shard ]:
multisource => false,
@@ -370,10 +367,13 @@
target => '/etc/init.d/mariadb',
}
- include mariadb::monitor_disk
+ class { 'mariadb::monitor_disk':
+ contact_group => 'admins',
+ }
class { 'mariadb::monitor_process':
process_count => 7,
+ contact_group => 'admins'
}
}
@@ -386,6 +386,7 @@
include standard
include role::mariadb::grants
+ include role::mariadb::monitor
include passwords::misc::scripts
class { 'mariadb::packages_wmf':
@@ -399,9 +400,6 @@
datadir => '/srv/sqldata',
tmpdir => '/srv/tmp',
}
-
- include mariadb::monitor_disk
- include mariadb::monitor_process
file { '/srv/innodb':
ensure => directory,
@@ -427,6 +425,7 @@
include standard
include role::mariadb::grants
+ include role::mariadb::monitor
include passwords::misc::scripts
class { 'mariadb::packages_wmf':
@@ -439,14 +438,6 @@
password => $passwords::misc::scripts::mysql_root_pass,
datadir => '/srv/sqldata',
tmpdir => '/srv/tmp',
- }
-
- class { 'mariadb::monitor_disk':
- contact_group => 'admins',
- }
-
- class { 'mariadb::monitor_process':
- contact_group => 'admins',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/189907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic166a6eba156da8ea3960b2172ca46f00a208a2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
