mon-commit

[Jim T. <tr...@us...>]

Update of /cvsroot/mon/mon/clients
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13898

Modified Files:
      Tag: mon-1-0-0pre1
	monshow 
Log Message:

added "monitor currently running" (boolean) and "monitor execution duration"
to opstatus detail


Index: monshow
===================================================================
RCS file: /cvsroot/mon/mon/clients/monshow,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** monshow	9 Jun 2004 05:18:07 -0000	1.1.1.1
--- monshow	3 Aug 2004 15:55:53 -0000	1.1.1.1.2.1
***************
*** 584,593 ****
      if ($dd == 0)
      {
!         sprintf("%02d:%02d", $hh, $mm);
      }
  
      else
      {
!         sprintf("%d days, %02d:%02d", $dd, $hh, $mm);
      }
  }
--- 584,593 ----
      if ($dd == 0)
      {
!         sprintf("%02d:%02d:%02d", $hh, $mm, $ss);
      }
  
      else
      {
!         sprintf("%d days, %02d:%02d:%02d", $dd, $hh, $mm, $ss);
      }
  }
***************
*** 1497,1504 ****
  
  	#
! 	# 0 = nothing special
! 	# 1 = do not display if zero
! 	# 2 = do not display if eq ""
  	#
  	foreach my $k (
  		["opstatus", "Operational Status", 0],
--- 1497,1516 ----
  
  	#
! 	# VAR:
! 	#   variable name from "show opstatus"
! 	#
! 	# DESCR:
! 	#   display name for variable
! 	# 
! 	# IFZERO:
! 	#   0 = nothing special
! 	#   1 = do not display if zero
! 	#   2 = do not display if eq ""
! 	#
! 	# TYPE:
! 	#   s = seconds
! 	#   b = boolean
  	#
+ 	my ($VAR, $DESCR, $IFZERO, $TYPE) = (0..3);
  	foreach my $k (
  		["opstatus", "Operational Status", 0],
***************
*** 1512,1537 ****
  		["first_failure", "First Failure", 2],
  		["failure_duration", "Failure Duration", 2],
! 		["interval", "Schedule Interval", 0],
  		["exclude_period", "Exclude Period", 2],
  		["exclude_hosts", "Exclude Hosts", 2],
! 		["randskew", "Random Skew", 1],
  		["alerts_sent", "Alerts Sent", 1],
! 		["last_alert", "Last Alert", 2])
  	{
  	    my $v = undef;
  
! 	    if ($d->{$k->[0]} ne "") {
! 	    	$v = \$d->{$k->[0]};
  
! 	    } elsif ($sref->{$k->[0]} ne "") {
! 	    	$v = \$sref->{$k->[0]};
  	    }
  
! 	    next if ($k->[2] == 1 && $$v == 0);
! 	    next if ($k->[2] == 2 && $$v eq "");
  
  	    $OUT_BUF .= <<EOF;
      <tr>
!     	<td align=right width="15%"><b>$k->[1]:</b></td>
  	<td> $$v </td>
  EOF
--- 1524,1571 ----
  		["first_failure", "First Failure", 2],
  		["failure_duration", "Failure Duration", 2],
! 		["interval", "Schedule Interval", 0, "s"],
  		["exclude_period", "Exclude Period", 2],
  		["exclude_hosts", "Exclude Hosts", 2],
! 		["randskew", "Random Skew", 1, "s"],
  		["alerts_sent", "Alerts Sent", 1],
! 		["last_alert", "Last Alert", 2],
! 		["monitor_duration", "Monitor Execution Duration", 2, "s"],
! 		["monitor_running", "Monitor currently running", 0, "b"],
! 	    )
  	{
  	    my $v = undef;
  
! 	    if ($d->{$k->[$VAR]} ne "") {
! 	    	$v = \$d->{$k->[$VAR]};
  
! 	    } elsif ($sref->{$k->[$VAR]} ne "") {
! 	    	$v = \$sref->{$k->[$VAR]};
  	    }
  
! 	    #
! 	    # convert types into display form
! 	    #
! 	    if ($k->[$TYPE] eq "s")
! 	    {
! 		if ($$v >= 0)
! 		{
! 		    $$v = secs_to_hms ($$v);
! 		}
! 	    }
! 
! 	    elsif ($k->[$TYPE] eq "b")
! 	    {
! 	    	$$v = $$v == 0 ? "false" : "true";
! 	    }
! 
! 	    #
! 	    # display if zero?
! 	    #
! 	    next if ($k->[$IFZERO] == 1 && $$v == 0);
! 	    next if ($k->[$IFZERO] == 2 && $$v eq "");
  
  	    $OUT_BUF .= <<EOF;
      <tr>
!     	<td align=right width="15%"><b>$k->[$DESCR]:</b></td>
  	<td> $$v </td>
  EOF