Dzahn has submitted this change and it was merged.

Change subject: deprecated syntax in icinga checkcommands.cfg.erb
......................................................................


deprecated syntax in icinga checkcommands.cfg.erb

Change-Id: I67f45f914070f90be14b24b0450daf9def22605c
---
M templates/icinga/checkcommands.cfg.erb
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Rush: Looks good to me, but someone else must approve
  Matanya: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/templates/icinga/checkcommands.cfg.erb 
b/templates/icinga/checkcommands.cfg.erb
index 7c4ea55..c0e6531 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -236,7 +236,7 @@
 
 define command{
        command_name    check_mysqlstatus
-       command_line    /usr/bin/php $USER1$/check_MySQL.php -h $HOSTADDRESS$ 
-u nagios -p <%= nagios_mysql_check_pass %> $ARG1$
+       command_line    /usr/bin/php $USER1$/check_MySQL.php -h $HOSTADDRESS$ 
-u nagios -p <%= @nagios_mysql_check_pass %> $ARG1$
        }
 
 # 'check_http_wikipedia' command definition, querying a different URL
@@ -373,12 +373,12 @@
 
 define command{
        command_name    check_longqueries
-       command_line    /usr/lib/nagios/plugins/check_longqueries -H 
$HOSTADDRESS$ -u nagios -p <%= nagios_mysql_check_pass %> -w 30 -c 66
+       command_line    /usr/lib/nagios/plugins/check_longqueries -H 
$HOSTADDRESS$ -u nagios -p <%= @nagios_mysql_check_pass %> -w 30 -c 66
 }
 
 define command{
        command_name    check_db_lag
-       command_line    $USER1$/check_mysql-replication.pl -sa $HOSTADDRESS$ 
-sl nagios -spd <%= nagios_mysql_check_pass %>  -a lag -w 60 -c 600
+       command_line    $USER1$/check_mysql-replication.pl -sa $HOSTADDRESS$ 
-sl nagios -spd <%= @nagios_mysql_check_pass %>  -a lag -w 60 -c 600
 }
 
 define command {

-- 
To view, visit https://gerrit.wikimedia.org/r/143527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I67f45f914070f90be14b24b0450daf9def22605c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to