Changeset 1496

Timestamp:

02/28/08 22:00:17 (4 years ago)

Author:

jo

Message:

munin-limits should work with multilevel-groups now.

Files:

• people/jo/multilevel-groups-2/server/Munin.pm.in (modified) (3 diffs)
• people/jo/multilevel-groups-2/server/munin-limits.in (modified) (16 diffs)

people/jo/multilevel-groups-2/server/Munin.pm.in

@@ -581 +581 @@
-    my $loc  = shift;
-
-while (my $tmpvar = shift 
+foreach my $tmpvar (
-        if ($tmpvar !~ /\S/) {
-            ::logger ("Error: munin_get_node: Cannot work on hash node \"$tmpvar\"");
@@ -587 +587 @@
-        }
-        return undef if !exists $hash->{$tmpvar};
-        return $hash->{$tmpvar} if @$loc <= 0;
-        $hash = $hash->{$tmpvar};
-    }
+    return $hash;
-}
-
@@ -716 +716 @@
-    } elsif ($var =~ /^\s*([^;:\.]+)\s*$/) {
-        $result = munin_set_var_loc ($hash, [$1], $val);
+    } elsif ($var =~ /^\s*([^:;]+)$/) {
+        my @leftarr = split (/\./, $1);
+        $result = munin_set_var_loc ($hash, [@leftarr], $val);
-    } elsif ($var =~ /^\s*(.+)\.([^\.:;]+)$/) {
-        my ($leftstring, $rightstring) = ($1, $2);

people/jo/multilevel-groups-2/server/munin-limits.in

@@ -24 +24 @@
-use Time::HiRes;
-use Text::Balanced qw (extract_multiple extract_delimited extract_quotelike extract_bracketed);
+use Data::Dumper;
-
-my $DEBUG=0;
@@ -96 +97 @@
-
-if (!defined $config->{'contact'}->{'nagios'}->{'command'} and
-
-
+
-    $config->{'contact'}->{'old-nagios'}->{'command'} = "$config->{nsca} $config->{nsca_server} -c $config->{nsca_config} -to 60";
-    $config->{'contact'}->{'old-nagios'}->{'always_send'} = "critical warning";
-}
-
-
+
-    $config->{'contact'}->{'nagios'}->{'always_send'} = "critical warning";
-}
+
+my $defaultcontacts = munin_get ($config, "contacts", "");
+if (!length $defaultcontacts) {
+    my @tmpcontacts = ();
+    foreach my $cont (@{munin_get_children ($config->{"contact"})}) {
+        if (munin_get ($cont, "command")) {
+            push @tmpcontacts, munin_get_node_name ($cont);
+        }
+    }
+    $defaultcontacts = join (' ', @tmpcontacts);
+}
+munin_set_var_loc ($config, ["contacts"], $defaultcontacts);
+logger ("Debug: Set default \"contacts\" to \"$defaultcontacts\"") if $DEBUG;
-
-# Make array of what needs to be checked
@@ -128 +140 @@
-logger("munin-limits finished ($update_time sec)");
-
-print Data::Dumper ($work_array
+#logger ("Dumper: " . Dumper (%notes)
-
-exit 0;
@@ -155 +167 @@
-        my $warn    = munin_get ($field, "warning", undef);
-        my $crit    = munin_get ($field, "critical", undef);
-path 
-
+fpath
+f
-
-        # Skip fields without warning/critical definitions
-        next if (!defined $warn and !defined $crit);
-
-$fname"
+".join ('::', @$fpath)
-        next if (@limit_services and !grep (/^$service$/, @limit_services));
-
@@ -180 +192 @@
-        $field->{'wrange'} = (defined $warn->[0]?$warn->[0]:"").":".(defined $warn->[1]?$warn->[1]:"");
-
-
+ .": $value (crit: $crit->[0]:$crit->[1]) (warn: $warn->[0]:$warn->[1])"
-        if ($value eq "unknown") {
-            $crit->[0] ||= "";
@@ -186 +198 @@
-            $hash->{'worst'} = "UNKNOWN" if $hash->{"worst"} eq "OK";
-            $hash->{'worstid'} = 3 if $hash->{"worstid"} == 0;
-$
-$
+@$f
+@$f
-
-            if (!defined $onfield or !defined $onfield->{"state"} or $onfield->{"state"} ne "unknown") {
-field
+hash
-            }
-        } elsif ((defined ($crit->[0]) and $value < $crit->[0]) or
@@ -198 +210 @@
-            $hash->{'worst'} = "CRITICAL";
-            $hash->{'worstid'} = 2;
-$
-$
+@$f
+@$f
-                (defined $field->{"extinfo"}? 
-                "$value (not in $crit->[0]:$crit->[1]): ".
@@ -206 +218 @@
-
-            if (!defined $onfield or !defined $onfield->{"state"} or $onfield->{"state"} ne "critical") {
-field
+hash
-            }
-        } elsif ((defined ($warn->[0]) and $value < $warn->[0]) or 
-
-
+
-            $warn->[0] ||= "";
-            $warn->[1] ||= "";
-            $hash->{'worst'} = "WARNING" if $hash->{"worst"} ne "CRITICAL";
-            $hash->{'worstid'} = 1 if $hash->{"worstid"} != 2;
-$
-$
+@$f
+@$f
-                (defined $field->{"extinfo"}?
-                "$value (not in $warn->[0]:$warn->[1]): ".
@@ -226 +237 @@
-            }
-        } elsif (defined $onfield and defined $onfield->{"state"} or $force) {
-$
-$path, "warning
+@$f
+@$fpath, "ok
-            $hash->{'state_changed'} = 1;
-        }
@@ -273 +284 @@
-    my $worst      = $hash->{"worst"};
-    my %stats      = ('critical' => [], 'warning' => [], 'unknown' => [], 'foks' => [], 'ok' => []);
-s
+
-
-    logger ("generating service message: ". join ('::', @{munin_get_node_loc ($hash)})) if $DEBUG;
@@ -295 +306 @@
-    $hash->{'numofields'}  = scalar @{$stats{'ok'}};
-
-
-
+
+
+
-        next if $c eq "none";
-        my $contactobj = munin_get_node ($config, ["contact", $c]);
@@ -309 +321 @@
-            $obsess = grep {scalar(@{$stats{$_}})} (split (/\s+/, lc $cas));
-        }
+        logger ("checking if state has changed $c");
-        if (!$hash->{'state_changed'} and !$obsess) {
-            next; # No need to send notification
-        }
+        logger ("state has changed, notifying $c");
-        my $precmd = munin_get ($contactobj, "command");
-        my $pretxt = munin_get ($contactobj, "text", munin_get (munin_get_node ($config, ["contact", "default"]), "text", $default_text{$c} || $default_text{"default"}));
-pretxt, $hash
-precmd, $hash
+hash, $pretxt
+hash, $precmd
-        $txt =~ s/\\n/\n/g;
-        $txt =~ s/\\t/\t/g;
@@ -327 +341 @@
-            close ($pipe);
-            $pipe = undef;
-
+
+
-        } elsif ($curcmd and $curcmd ne $cmd) {
-            close ($pipe);
-            $pipe = undef;
-
+
+
-        }
-    
-        if (!defined $pipe) {
-            my @cmd = extract_multiple (
-
+hash, $
-                    [ sub { extract_delimited ($_[0], q{"'})},
-                      qr/\S+/
@@ -342 +358 @@
-                    undef, 1);
-            @cmd = map { s/['"]$//; s/^['"]//; $_ } @cmd;
-munin_set_var ($contactobj, "num_messages", 0)
+$contactobj->{"num_messages"} = 0
-            if ($cmd[0] eq "|") {
-                $cmd[0] = "|-";
@@ -348 +364 @@
-                unshift (@cmd, "|-");
-            }
-
+\"$c\" 
-            if ($cmd[0] eq ">") {
-                if (! open ($pipe, join (' ', @cmd))) {
@@ -396 +412 @@
-                }
-            }
-
-
+
+
+
-        } 
-        logger ("sending message: \"$txt\"") if ($DEBUG);
+        logger ("bar?");
-        print $pipe $txt, "\n" if (defined $pipe);
-munin_set_var ($contactobj, "num_messages", 1 + munin_get ($contactobj, "num_messages", 0)
+$contactobj->{"num_messages"} = 1 + munin_get ($contactobj, "num_messages", 0
-    }
-}