From: Michael Howe <michael@michaelhowe.org>
Date: Sat, 14 Sep 2013 17:49:40 +0000 (+0000)
Subject: Fix bugs
X-Git-Tag: 0.8~1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=72227a536ea6c83c5b3fb800a08a26edb72d7e51;p=packages%2Fm%2Fmunin-plugins-local.git

Fix bugs
---

diff --git a/debian/changelog b/debian/changelog
index 9cabb83..efbb4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-munin-plugins-local (0.8) UNRELEASED; urgency=low
+munin-plugins-local (0.8) unstable; urgency=low
 
   * Add snmp__sky_router_ for network clients and bandwidth usage 
 
diff --git a/debian/control b/debian/control
index 6da35c1..15e0aa0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.9.3
 Package: munin-plugins-local
 Architecture: all
 Depends: munin-node, ${misc:Depends}
-Recommends: nvidia-smi, smartctl, libxml-fast-perl, libhtml-tree-perl
+Recommends: nvidia-smi, smartctl, libxml-fast-perl, libhtml-tree-perl, libwww-mechanize-perl
 Suggests: python
 Description: network-wide graphing framework (local plugins for node)
  Extra plugins for munin-node, for use on michaelhowe.org machines.
diff --git a/plugins/snmp__sky_router_ b/plugins/snmp__sky_router_
index 402f815..16c7d2c 100755
--- a/plugins/snmp__sky_router_
+++ b/plugins/snmp__sky_router_
@@ -36,6 +36,8 @@ None currently available
 
 =head1 BUGS
 
+Using the 'rate' option will lock other administrators out of the device.
+
 =head1 AUTHORS
 
 Michael Howe
@@ -46,8 +48,7 @@ my $macre = $RE{net}{MAC};
 my $ipre = $RE{net}{IPv4};
 
 # All we care about is the host:
-#my ( $host ) = Munin::Plugin::SNMP->config_session();
-my $host = "192.168.5.1";
+my ( $host ) = Munin::Plugin::SNMP->config_session();
 
 my ( $verbose );
 GetOptions( "verbose"   => \$verbose );
@@ -58,10 +59,7 @@ my $pass = $ENV{password};
 # * Traffic rate
 # * Connected devices
 
-my $basename = $0;
-$basename =~ m{.*_[^_]+$};
-
-$basename = 'devices';
+my ( $basename ) = $0 =~ m{.*_([^_]+)$};
 
 my $config = ( defined $ARGV[0] and $ARGV[0] eq 'config' );
 
@@ -74,7 +72,7 @@ if( $basename eq 'rate' ){
 } elsif( $basename eq 'devices' ){
     get_devices();
 } else {
-    die "Incorrect option: '$basename'\n";
+    die "Incorrect suffix on $0: '$basename'\n";
 }
 
 sub get_rate {