fix argument for print

[upsgraph] / upsgraph.pl

diff --git a/upsgraph.pl b/upsgraph.pl
index 745a44cbe2dae92c4a3b7d3ea17bbab1417a35e1..5c94daf0535b5219d0a5e7dc32ac33635b5d8f62 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -1,102 +1,40 @@
 #!/usr/bin/perl -w
 
 #!/usr/bin/perl -w
 

-if (@ARGV != 3) {
-       print STDERR "Syntax: ${0} host /path/to/file.rrd /output/directory/\n";
+if ((@ARGV != 1) && (@ARGV != 2)) {
+       print STDERR "Syntax: ${0} configfile [uid]\n";

        exit(1);
 }
 
        exit(1);
 }
 

-my $host=$ARGV[0];
-my $rrdfile=$ARGV[1];
-my $outdir=$ARGV[2];
-my $community="public";
-my $step=60;
-
-my @fields = ( 'inputV', 'outputV', 'inputHZ', 'outputHZ', 'battT', 'battC', 'load', 'ambT', 'ambH', 'timeR', 'timeO' );
-
-my $vars = {
-       'inputV' => {
-               'name' => 'Input Voltage',
-               'oidtext' => 'PowerNet-MIB::upsAdvInputLineVoltage.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.3.2.1.0',
-               'min' => '180',
-               'max' => '280',
-       },
-       'outputV' => {
-               'name' => 'Output Voltage',
-               'oidtext' => 'PowerNet-MIB::upsAdvOutputVoltage.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.4.2.1.0',
-               'min' => '180',
-               'max' => '280',
-       },
-       'inputHZ' => {
-               'name' => 'Input Frequency',
-               'oidtext' => 'PowerNet-MIB::upsAdvInputFrequency.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.3.2.4.0',
-               'min' => '40',
-               'max' => '60',
-       },
-       'outputHZ' => {
-               'name' => 'Output Frequency',
-               'oidtext' => 'PowerNet-MIB::upsAdvOutputFrequency.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.4.2.2.0',
-               'min' => '40',
-               'max' => '60',
-       },
-       'battT' => {
-               'name' => 'Battery Temperature',
-               'oidtext' => 'PowerNet-MIB::upsAdvBatteryTemperature.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.2.2.2.0',
-               'min' => '0',
-               'max' => '100',
-       },
-       'battC' => {
-               'name' => 'Battery Capacity',
-               'oidtext' => 'PowerNet-MIB::upsAdvBatteryCapacity.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.2.2.1.0',
-               'min' => '0',
-               'max' => '110',
-       },
-       'load' => {
-               'name' => 'UPS Load',
-               'oidtext' => 'PowerNet-MIB::upsAdvOutputLoad.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.4.2.3.0',
-               'min' => '0',
-               'max' => '110',
-       },
-       'ambT' => {
-               'name' => 'Ambient Temperature',
-               'oidtext' => 'PowerNet-MIB::mUpsEnvironAmbientTemperature.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.2.1.1.0',
-               'min' => '0',
-               'max' => '60',
-       },
-       'ambH' => {
-               'name' => 'Ambient Humidity',
-               'oidtext' => 'PowerNet-MIB::mUpsEnvironRelativeHumidity.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.2.1.2.0',
-               'min' => '0',
-               'max' => '100',
-       },
-       'timeR' => {
-               'name' => 'Time Remaining',
-               'oidtext' => 'PowerNet-MIB::upsAdvBatteryRunTimeRemaining.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.2.2.3.0',
-               'factor' => 1/6000,
-               'min' => '0',
-               'max' => '360',
-       },
-       'timeO' => {
-               'name' => 'Time On Battery',
-               'oidtext' => 'PowerNet-MIB::upsBasicBatteryTimeOnBattery.0',
-               'oid' => '1.3.6.1.4.1.318.1.1.1.2.1.2.0',
-               'factor' => 1/6000,
-               'min' => '0',
-               'max' => '360',
-       },
-};
-

 use Net::SNMP;
 
 use Net::SNMP;
 

+$UPSGRAPH::host = "";
+$UPSGRAPH::rrdfile = "";
+$UPSGRAPH::outdir = "";
+$UPSGRAPH::community = "public";
+$UPSGRAPH::step = 60;
+@UPSGRAPH::fields = ();
+$UPSGRAPH::vars = {};
+
+do $ARGV[0] or die "can't read config: $!";
+
+my $host = $UPSGRAPH::host;
+my $rrdfile = $UPSGRAPH::rrdfile;
+my $outdir = $UPSGRAPH::outdir;
+my $community = $UPSGRAPH::community;
+my $step = $UPSGRAPH::step;
+my @fields = @UPSGRAPH::fields;
+my $vars = $UPSGRAPH::vars;
+
+if ($> == 0) {
+       if (@ARGV != 2) {
+               print STDERR "Running as root, please provide UID as 4th argument!\n";
+               exit(1);
+       }
+
+       print "Running as root, switching to ".$ARGV[1]."\n";
+       $< = $> = $ARGV[1];
+}
+

 if (! -e "${rrdfile}") {
        my $cmd = "rrdtool create \"${rrdfile}\" ";
        foreach my $var (@fields) {
 if (! -e "${rrdfile}") {
        my $cmd = "rrdtool create \"${rrdfile}\" ";
        foreach my $var (@fields) {


@@ -110,6 +48,12 @@ if (! -e "${rrdfile}") {
        print `${cmd}`;
 }
 
        print `${cmd}`;
 }
 

+my $child = fork();
+
+die "fork failed!" if (!defined($child));
+
+exit 0 if ($child != 0);
+

 while(1) {
        ($session,$error) = Net::SNMP->session(Hostname => $host,
                        Community => $community);
 while(1) {
        ($session,$error) = Net::SNMP->session(Hostname => $host,
                        Community => $community);


@@ -137,7 +81,6 @@ while(1) {
                if (!(defined($vars->{$var}->{'value'}))) {
                        $vars->{$var}->{'value'} = 'U';
                }
                if (!(defined($vars->{$var}->{'value'}))) {
                        $vars->{$var}->{'value'} = 'U';
                }

-               print $vars->{$var}->{'name'}.": ".$vars->{$var}->{'value'}."\n";

                $cmd .= ":" . $vars->{$var}->{'value'};
        }
        $cmd .= "\"";
                $cmd .= ":" . $vars->{$var}->{'value'};
        }
        $cmd .= "\"";


@@ -164,6 +107,7 @@ while(1) {
 
        print HTML "</body></html>\n";
        print HTML "<br>Generated on: " . localtime(time());
 
        print HTML "</body></html>\n";
        print HTML "<br>Generated on: " . localtime(time());

+       print HTML ' by <a href="http://git.zerfleddert.de/cgi-bin/gitweb.cgi/upsgraph">upsgraph</a>.';

 
        close(HTML);
 
 
        close(HTML);