[Devmon-devel] SF.net SVN: devmon:[250] trunk/modules/dm_tests.pm

[<buc...@us...>]

Revision: 250
          http://sourceforge.net/p/devmon/code/250
Author:   buchanmilne
Date:     2015-06-02 15:13:49 +0000 (Tue, 02 Jun 2015)
Log Message:
-----------
Keep sending RRD data for rows that don't alarm, if you don't want RRDs, ignore the row

Modified Paths:
--------------
    trunk/modules/dm_tests.pm

Modified: trunk/modules/dm_tests.pm
===================================================================
--- trunk/modules/dm_tests.pm	2015-06-02 14:59:22 UTC (rev 249)
+++ trunk/modules/dm_tests.pm	2015-06-02 15:13:49 UTC (rev 250)
@@ -2037,10 +2037,13 @@
               for my $name (keys %rrd) {
                 $rrd{$name}{'pri'} = $oid if $rrd{$name}{'pri'} eq 'pri';
 
-                if ($rrd{$name}{'all'} or $alarm) {
+		# This condition looks incorrect. We should not remove rrds if alerting
+		# is disabled for this leaf. If the user doesnt want a graph, they probably
+		# dont want this leaf in the table, they should set 'ignore' instead of 'noalarm'
+		#if ($rrd{$name}{'all'} or $alarm) {
                   # add to list, but check we're not pushing multiple times
                   push @{$rrd{$name}{'leaves'}}, $leaf unless grep {$_ eq $leaf} @{$rrd{$name}{'leaves'}};
-                }
+		#}
               }
               
              # If this is our primary oid, and we are have an alarm

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.