Lcarr has submitted this change and it was merged.
Change subject: fixing percona checks to the correct icinga files / conf space
......................................................................
fixing percona checks to the correct icinga files / conf space
Change-Id: I49eb18aab1ac0c70708d0cb8b9fc3ea3166f7eee
---
R files/icinga/percona/COPYING
R files/icinga/percona/check_lvs
R files/icinga/percona/check_mysql_deadlocks
R files/icinga/percona/check_mysql_idle_transactions
R files/icinga/percona/check_mysql_recent_restart
R files/icinga/percona/check_mysql_slave_delay
R files/icinga/percona/check_mysql_slave_running
R files/icinga/percona/check_mysql_unauthenticated_users
R files/icinga/percona/check_mysqld_deleted_files
R files/icinga/percona/check_mysqld_file_ownership
R files/icinga/percona/check_mysqld_frm_ibd
R files/icinga/percona/check_mysqld_pid_file
R files/icinga/percona/utils.sh
M manifests/mysql.pp
14 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/nagios/percona/COPYING b/files/icinga/percona/COPYING
similarity index 100%
rename from files/nagios/percona/COPYING
rename to files/icinga/percona/COPYING
diff --git a/files/nagios/percona/check_lvs b/files/icinga/percona/check_lvs
similarity index 100%
rename from files/nagios/percona/check_lvs
rename to files/icinga/percona/check_lvs
diff --git a/files/nagios/percona/check_mysql_deadlocks
b/files/icinga/percona/check_mysql_deadlocks
similarity index 100%
rename from files/nagios/percona/check_mysql_deadlocks
rename to files/icinga/percona/check_mysql_deadlocks
diff --git a/files/nagios/percona/check_mysql_idle_transactions
b/files/icinga/percona/check_mysql_idle_transactions
similarity index 100%
rename from files/nagios/percona/check_mysql_idle_transactions
rename to files/icinga/percona/check_mysql_idle_transactions
diff --git a/files/nagios/percona/check_mysql_recent_restart
b/files/icinga/percona/check_mysql_recent_restart
similarity index 100%
rename from files/nagios/percona/check_mysql_recent_restart
rename to files/icinga/percona/check_mysql_recent_restart
diff --git a/files/nagios/percona/check_mysql_slave_delay
b/files/icinga/percona/check_mysql_slave_delay
similarity index 100%
rename from files/nagios/percona/check_mysql_slave_delay
rename to files/icinga/percona/check_mysql_slave_delay
diff --git a/files/nagios/percona/check_mysql_slave_running
b/files/icinga/percona/check_mysql_slave_running
similarity index 100%
rename from files/nagios/percona/check_mysql_slave_running
rename to files/icinga/percona/check_mysql_slave_running
diff --git a/files/nagios/percona/check_mysql_unauthenticated_users
b/files/icinga/percona/check_mysql_unauthenticated_users
similarity index 100%
rename from files/nagios/percona/check_mysql_unauthenticated_users
rename to files/icinga/percona/check_mysql_unauthenticated_users
diff --git a/files/nagios/percona/check_mysqld_deleted_files
b/files/icinga/percona/check_mysqld_deleted_files
similarity index 100%
rename from files/nagios/percona/check_mysqld_deleted_files
rename to files/icinga/percona/check_mysqld_deleted_files
diff --git a/files/nagios/percona/check_mysqld_file_ownership
b/files/icinga/percona/check_mysqld_file_ownership
similarity index 100%
rename from files/nagios/percona/check_mysqld_file_ownership
rename to files/icinga/percona/check_mysqld_file_ownership
diff --git a/files/nagios/percona/check_mysqld_frm_ibd
b/files/icinga/percona/check_mysqld_frm_ibd
similarity index 100%
rename from files/nagios/percona/check_mysqld_frm_ibd
rename to files/icinga/percona/check_mysqld_frm_ibd
diff --git a/files/nagios/percona/check_mysqld_pid_file
b/files/icinga/percona/check_mysqld_pid_file
similarity index 100%
rename from files/nagios/percona/check_mysqld_pid_file
rename to files/icinga/percona/check_mysqld_pid_file
diff --git a/files/nagios/percona/utils.sh b/files/icinga/percona/utils.sh
similarity index 100%
rename from files/nagios/percona/utils.sh
rename to files/icinga/percona/utils.sh
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 80ae359..cdf5c9f 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -163,7 +163,7 @@
$mysql_check_pass = $passwords::nagios::mysql::mysql_check_pass
file {
- "${nagios_config_dir}/nrpe.d/nrpe_percona.cfg":
+ "${icinga_config_dir}/nrpe.d/nrpe_percona.cfg":
owner => root,
group => nagios,
mode => 0440,
@@ -175,62 +175,62 @@
group => root,
mode => 0755;
"/usr/lib/nagios/plugins/percona/check_lvs":
- source =>
"puppet:///files/nagios/percona/check_lvs",
+ source =>
"puppet:///files/icinga/percona/check_lvs",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysql_deadlocks":
- source =>
"puppet:///files/nagios/percona/check_mysql_deadlocks",
+ source =>
"puppet:///files/icinga/percona/check_mysql_deadlocks",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysql_idle_transactions":
- source =>
"puppet:///files/nagios/percona/check_mysql_idle_transactions",
+ source =>
"puppet:///files/icinga/percona/check_mysql_idle_transactions",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysql_recent_restart":
- source =>
"puppet:///files/nagios/percona/check_mysql_recent_restart",
+ source =>
"puppet:///files/icinga/percona/check_mysql_recent_restart",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysql_slave_delay":
- source =>
"puppet:///files/nagios/percona/check_mysql_slave_delay",
+ source =>
"puppet:///files/icinga/percona/check_mysql_slave_delay",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysql_slave_running":
- source =>
"puppet:///files/nagios/percona/check_mysql_slave_running",
+ source =>
"puppet:///files/icinga/percona/check_mysql_slave_running",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysql_unauthenticated_users":
- source =>
"puppet:///files/nagios/percona/check_mysql_unauthenticated_users",
+ source =>
"puppet:///files/icinga/percona/check_mysql_unauthenticated_users",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysqld_deleted_files":
- source =>
"puppet:///files/nagios/percona/check_mysqld_deleted_files",
+ source =>
"puppet:///files/icinga/percona/check_mysqld_deleted_files",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysqld_file_ownership":
- source =>
"puppet:///files/nagios/percona/check_mysqld_file_ownership",
+ source =>
"puppet:///files/icinga/percona/check_mysqld_file_ownership",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysqld_frm_ibd":
- source =>
"puppet:///files/nagios/percona/check_mysqld_frm_ibd",
+ source =>
"puppet:///files/icinga/percona/check_mysqld_frm_ibd",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/check_mysqld_pid_file":
- source =>
"puppet:///files/nagios/percona/check_mysqld_pid_file",
+ source =>
"puppet:///files/icinga/percona/check_mysqld_pid_file",
owner => root,
group => root,
mode => 0555;
"/usr/lib/nagios/plugins/percona/utils.sh":
- source =>
"puppet:///files/nagios/percona/utils.sh",
+ source =>
"puppet:///files/icinga/percona/utils.sh",
owner => root,
group => root,
mode => 0555;
--
To view, visit https://gerrit.wikimedia.org/r/55799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49eb18aab1ac0c70708d0cb8b9fc3ea3166f7eee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
