wget: Update to 1.20.2

[ipfire-2.x.git] / src / scripts / makegraphs

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 9542c8f485638aff2f7bb732a0d166fd1658be13..b91a70e3adf5a39e9589e788eeb011e592c3b34b 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -3,7 +3,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2008-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -60,7 +60,7 @@ sub updatehdddata{
                print "Error in RRD::create for hddshutdown-".$array[$#array].": $ERROR\n" if $ERROR;
        }
 
-       if (-e "/tmp/hddshutdown-".$array[$#array]) {$standby = 1;}
+       if (-e "/var/run/hddshutdown-".$array[$#array]) {$standby = 1;}
        else {$standby = 0;}
 
        RRDs::update ("$mainsettings{'RRDLOG'}/hddshutdown-".$array[$#array].".rrd", "-t", "standby", "N:$standby");
@@ -83,12 +83,19 @@ sub updatehdddata{
        if (!$standby){
                $temp = 0;
                my $smart_output = '';
-               system("$path_smartctl -iHA -d ata /dev/$disk > /tmp/smartctl_out_hddtemp-$disk");
-               if ( -e "/tmp/smartctl_out_hddtemp-".$array[$#array] ){
-                       my $hdd_output = `cat /tmp/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
-                       my @t = split(/\s+/,$hdd_output);
-                       $temp = $t[9];
-               }else{$temp = 0;}
+               system("$path_smartctl -iHA /dev/$disk > /var/run/smartctl_out_hddtemp-$disk");
+               if ( -e "/var/run/smartctl_out_hddtemp-".$array[$#array] ){
+                       my $hdd_nvme = `grep "NVMe Log" /var/run/smartctl_out_hddtemp-$array[$#array]`;
+                       if ( $hdd_nvme !~/NVMe Log/ ) {
+                               my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
+                               my @t = split(/\s+/,$hdd_output);
+                               $temp = $t[9];
+                       } else {
+                               my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature:`;
+                               my @t = split(/\s+/,$hdd_output);
+                               $temp = $t[1];
+                       }
+               } else { $temp = 0; }
                print "Temperature for ".$array[$#array]."->".$temp."<-\n";
                # Nur ins RDD wenn nicht 0 (sonst klappt die min Anzeige nicht)
                if ($temp){
@@ -102,8 +109,8 @@ sub updatehdddata{
 ## Update vnstat
 system ('/usr/bin/vnstat -u');
 
-my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
-system("unlink /tmp/hddstatus && touch /tmp/hddstatus");
+my @disks = `ls -1 /sys/block | grep -E '^sd|^nvme|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
+system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus");
 foreach (@disks){
        my $disk = $_;
        chomp $disk;
@@ -114,7 +121,7 @@ foreach (@disks){
        my $newdiskstats = "";
        my @array = split(/\//,$disk);
 
-       $diskstats = `cat /tmp/hddstats-$array[$#array]`;
+       $diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`;
        chomp $diskstats;
        my $newdiskstats = `/usr/bin/iostat -d -t $disk | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
        chomp $newdiskstats;
@@ -122,13 +129,13 @@ foreach (@disks){
        chomp $status;
 
        if ($status !~/standby/ || $diskstats ne $newdiskstats){
-               if (-e "/tmp/hddshutdown-".$array[$#array]){system("unlink /tmp/hddshutdown-".$array[$#array]);}
+               if (-e "/var/run/hddshutdown-".$array[$#array]){system("unlink /var/run/hddshutdown-".$array[$#array]." 2>/dev/null");}
        }
 
-       if (-e "/tmp/hddshutdown-".$array[$#array]){$status = " standby\n";}
+       if (-e "/var/run/hddshutdown-".$array[$#array]){$status = " standby\n";}
        else{$status = " active\n";}
 
-       open(DATEI, ">>/tmp/hddstatus") || die "Datei nicht gefunden";
+       open(DATEI, ">>/var/run/hddstatus") || die "Datei nicht gefunden";
        print DATEI $disk."-".$status;
        close(DATEI);