File nagtrap-0.1.3-use_config.patch of Package nagtrap

Overview Repositories Revisions Requests Users Attributes Meta

File nagtrap-0.1.3-use_config.patch of Package nagtrap (Revision caed76eda9fdaff09df3b6cdf01e8ea2)

Currently displaying revision caed76eda9fdaff09df3b6cdf01e8ea2 , Show latest

Index: dist/check_snmp_traps
===================================================================
--- dist/check_snmp_traps.orig
+++ dist/check_snmp_traps
@@ -6,6 +6,8 @@
 #
 #set -xv
 
+CONFIG_FILE=/etc/nagtrap/check_snmp_traps.conf
+
 MYSQL=/usr/bin/mysql
 MYSQL_USER=snmptt
 MYSQL_DB=snmptt
@@ -50,6 +52,10 @@
 
 while test -n "$1"; do
     case "$1" in
+        -c) 
+            CONFIG_FILE="$2"
+            shift
+            ;;
         --help)
             print_help
             exit $STATE_OK
@@ -83,6 +89,9 @@
     shift
 done
 
+if [ -r "$CONFIG_FILE" ]; then
+    . "$CONFIG_FILE"
+fi
 
 # Anzahl der Critical Traps
 COUNT_CRITICAL=`echo "select count(*) from snmptt where hostname like '%$HOST%' and severity = 'CRITICAL' and trapread = '0'" | mysql -s -u $MYSQL_USER --password=$MYSQL_PASS $MYSQL_DB`
Index: plugin/check_snmptraps.pl
===================================================================
--- plugin/check_snmptraps.pl.orig
+++ plugin/check_snmptraps.pl
@@ -32,7 +32,7 @@
 my $debugLogFile = "/tmp/check_snmptraps.log";
 
 # ==================== Variables ====================
-my ($opt_V, $opt_h, $opt_C, $opt_H, $opt_O, $opt_t, $opt_r, $opt_S, $opt_m, $opt_w, $opt_c);
+my ($opt_V, $opt_h, $opt_C, $opt_H, $opt_O, $opt_t, $opt_r, $opt_S, $opt_m, $opt_w, $opt_c, $opt_f);
 my $PROGNAME = "check_snmptraps.pl";
 my $version = "1.1 beta";
 my $queryCategory = "";
@@ -89,6 +89,8 @@
    printf "     seconds before the plugin times out (default=$TIMEOUT)\n";
    printf "   -V (--version)\n";
    printf "     Plugin version\n";
+   printf "   -f (--configfile)\n";
+   printf "      Use Database connection parameters stored in this file\n";
    printf "   -h (--help)\n";
    printf "     Print this help \n";
 }
@@ -138,17 +140,18 @@
 # ==================== Get options ====================
 Getopt::Long::Configure('bundling');
 GetOptions(
-   "H=s" => \$opt_H, "hostname"	=> \$opt_H,
-   "C=s" => \$opt_C, "category"	=> \$opt_C,
-   "O=s" => \$opt_O, "oid"	=> \$opt_O,
-   "w"   => \$opt_w, "warning"  => \$opt_w,
-   "c" 	 => \$opt_c, "critical" => \$opt_c,
-   "r"   => \$opt_r, "read"	=> \$opt_r,
-   "S=s" => \$opt_S, "search=s"	=> \$opt_S,
-   "m"   => \$opt_m, "message"  => \$opt_m,
-   "t=i" => \$opt_t, "timeout"  => \$opt_t,
-   "V"   => \$opt_V, "version"  => \$opt_V,
-   "h"   => \$opt_h, "help"     => \$opt_h);
+   "H=s" => \$opt_H, "hostname"	    => \$opt_H,
+   "C=s" => \$opt_C, "category"	    => \$opt_C,
+   "O=s" => \$opt_O, "oid"	    => \$opt_O,
+   "w"   => \$opt_w, "warning"      => \$opt_w,
+   "c" 	 => \$opt_c, "critical"     => \$opt_c,
+   "r"   => \$opt_r, "read"	    => \$opt_r,
+   "S=s" => \$opt_S, "search=s"	    => \$opt_S,
+   "m"   => \$opt_m, "message"      => \$opt_m,
+   "t=i" => \$opt_t, "timeout"      => \$opt_t,
+   "V"   => \$opt_V, "version"      => \$opt_V,
+   "f=s" => \$opt_f, "configfile=s" => \$opt_f,
+   "h"   => \$opt_h, "help"         => \$opt_h);
 
 # ==================== Main ====================
 if ($opt_t) {
@@ -182,6 +185,16 @@
    exit $ERRORS{'UNKNOWN'};
 }
 
+if (defined($opt_f) && -f $opt_f){
+	use Config::Simple;
+	my $cfg = new Config::Simple("$opt_f");
+	$dbHost  = $cfg->{'_DATA'}{'default'}{'MYSQL_HOST'}[0] if (defined($cfg->{'_DATA'}{'default'}{'MYSQL_HOST'}[0]));
+	$dbName  = $cfg->{'_DATA'}{'default'}{'MYSQL_DB'}[0] if (defined($cfg->{'_DATA'}{'default'}{'MYSQL_DB'}[0]));
+	$dbUser  = $cfg->{'_DATA'}{'default'}{'MYSQL_USER'}[0] if (defined($cfg->{'_DATA'}{'default'}{'MYSQL_USER'}[0]));
+	$dbPass  = $cfg->{'_DATA'}{'default'}{'MYSQL_PASS'}[0] if (defined($cfg->{'_DATA'}{'default'}{'MYSQL_PASS'}[0]));
+	$dbTable = $cfg->{'_DATA'}{'default'}{'MYSQL_TABLE'}[0] if (defined($cfg->{'_DATA'}{'default'}{'MYSQL_TABLE'}[0]));
+}
+
 # Create query for search string in trap messages
 if ($opt_S) {
    $querySearchString = "AND LOCATE('$opt_S',formatline)>0";

Places

File nagtrap-0.1.3-use_config.patch of Package nagtrap (Revision caed76eda9fdaff09df3b6cdf01e8ea2)

Places