[icinga-checkins] icinga.org: icinga-core/fholzer/core: sanitycheck - resource.cfg bugfix

git at icinga.org git at icinga.org
Thu Apr 26 16:01:48 CEST 2012


Module: icinga-core
Branch: fholzer/core
Commit: 3a4443b0284fd4791a173cd08f30bb6a119e3eca
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3a4443b0284fd4791a173cd08f30bb6a119e3eca

Author: Franz Holzer <office at frankstar.at>
Date:   Thu Apr 26 16:01:55 2012 +0200

sanitycheck - resource.cfg bugfix
change output for $USER1$

---

 tools/icinga_verification.pl |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/icinga_verification.pl b/tools/icinga_verification.pl
index 160040e..bd5d0f3 100644
--- a/tools/icinga_verification.pl
+++ b/tools/icinga_verification.pl
@@ -292,7 +292,7 @@ chomp($raw_plugin_path);
 if ($raw_plugin_path){
 	$plugin_path = $raw_plugin_path if -e "$raw_plugin_path/check_ping";
 } if (!$plugin_path){
-	$plugin_path = "\$USER1\$ is no Path!";
+	$plugin_path = "\$USER1\$ is no Path or an incorrect Path";
 }
 
 
@@ -466,10 +466,11 @@ if ($icingacfguser eq 'root'){
 	print $statusok, "icinga.cfg - icinga_user = $icingacfguser";
 }
 print "\n";
-if ($plugin_path){
-	print $statuswarn, "resource.cfg - \$USER1\$ is no Path";
-} else {	
-	print $statusok, "resource.cfg - Plugin Path $plugin_path";
+# check resource.cfg for $user1$
+if ($raw_plugin_path eq $plugin_path){
+	print $statusok, "resource.cfg - Plugin Path: $plugin_path";
+} else {		
+	print $statuswarn, "resource.cfg - \$USER1\$ is no Path or an incorrect Path";
 }
 ### Service Status ###
 print <<EOF;





More information about the icinga-checkins mailing list