mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added new readings for each network interface: ip and ip6

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6376 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hexenmeister
2014-08-07 21:28:43 +00:00
parent 37d2c74bc5
commit fa2b7e585d
1 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
fhem/FHEM/42_SYSMON.pm
View File

@@ -30,7 +30,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $VERSION = "1.5.0"; my $VERSION = "1.6.0";
use constant { use constant {
DATE => "date", DATE => "date",
@@ -60,6 +60,8 @@ use constant {
ETH0 => "eth0", ETH0 => "eth0",
WLAN0 => "wlan0", WLAN0 => "wlan0",
DIFF_SUFFIX => "_diff", DIFF_SUFFIX => "_diff",
IP_SUFFIX => "_ip",
IP6_SUFFIX => "_ip6",
FB_WLAN_STATE => "wlan_state", FB_WLAN_STATE => "wlan_state",
FB_WLAN_GUEST_STATE => "wlan_guest_state", FB_WLAN_GUEST_STATE => "wlan_guest_state",
FB_INET_IP => "internet_ip", FB_INET_IP => "internet_ip",
@@ -307,6 +309,8 @@ SYSMON_updateCurrentReadingsMap($) {
$rMap->{$nName."_diff"} = $nPt." (diff)"; $rMap->{$nName."_diff"} = $nPt." (diff)";
$rMap->{$nName."_rx"} = $nPt." (RX)"; $rMap->{$nName."_rx"} = $nPt." (RX)";
$rMap->{$nName."_tx"} = $nPt." (TX)"; $rMap->{$nName."_tx"} = $nPt." (TX)";
$rMap->{$nName."_ip"} = $nPt." (IP)";
$rMap->{$nName."_ip6"} = $nPt." (IP6)";
} }
} else { } else {
@@ -318,54 +322,72 @@ SYSMON_updateCurrentReadingsMap($) {
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = "ath1"; $nName = "ath1";
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = "cpmac0"; $nName = "cpmac0";
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = "dsl"; $nName = "dsl";
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = ETH0; $nName = ETH0;
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = "guest"; $nName = "guest";
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = "hotspot"; $nName = "hotspot";
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = "lan"; $nName = "lan";
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = "vdsl"; $nName = "vdsl";
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
} else { } else {
my $nName = ETH0; my $nName = ETH0;
@@ -373,12 +395,16 @@ SYSMON_updateCurrentReadingsMap($) {
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
$nName = WLAN0; $nName = WLAN0;
$rMap->{$nName} = "Network adapter ".$nName; $rMap->{$nName} = "Network adapter ".$nName;
$rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)"; $rMap->{$nName."_diff"} = "Network adapter ".$nName." (diff)";
$rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)"; $rMap->{$nName."_rx"} = "Network adapter ".$nName." (RX)";
$rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)"; $rMap->{$nName."_tx"} = "Network adapter ".$nName." (TX)";
$rMap->{$nName."_ip"} = "Network adapter ".$nName." (IP)";
$rMap->{$nName."_ip6"} = "Network adapter ".$nName." (IP6)";
} }
} }
@@ -1475,12 +1501,27 @@ sub SYSMON_getNetworkInfo ($$$)
# Kollisionen:0 Sendewarteschlangenlaenge:1000 # Kollisionen:0 Sendewarteschlangenlaenge:1000
# RX bytes:25517384 (24.3 MiB) TX bytes:683970999 (652.2 MiB) # RX bytes:25517384 (24.3 MiB) TX bytes:683970999 (652.2 MiB)
my $ip = undef; my $ip6 = undef;
foreach (@dataThroughput) { foreach (@dataThroughput) {
if($_=~ m/inet\s+(addr:)*(\S*)/) {
$ip=$2;
}
if($_=~ m/inet6\s+(addr:)*\s*(\S*)/) {
$ip6=$2;
}
if(index($_, 'RX bytes') >= 0) { if(index($_, 'RX bytes') >= 0) {
$dataThroughput = $_; $dataThroughput = $_;
last; last;
} }
} }
if(defined $ip) {
$map->{$nName.IP_SUFFIX} = $ip;
}
if(defined $ip6) {
$map->{$nName.IP6_SUFFIX} = $ip6;
}
my $rxRaw = -1; my $rxRaw = -1;
my $txRaw = -1; my $txRaw = -1;
@@ -2139,7 +2180,7 @@ If one (or more) of the multiplier is set to zero, the corresponding readings is
<li>cpu_bogomips<br> <li>cpu_bogomips<br>
CPU Speed: BogoMIPS CPU Speed: BogoMIPS
</li> </li>
<li>cpu_freq<br> <li>cpu_freq (and cpu1_freq for dual core systems)<br>
CPU frequency CPU frequency
</li> </li>
<br> <br>
@@ -2195,6 +2236,9 @@ If one (or more) of the multiplier is set to zero, the corresponding readings is
<code>eth0: RX: 940.58 MB, TX: 736.19 MB, Total: 1676.77 MB</code><br> <code>eth0: RX: 940.58 MB, TX: 736.19 MB, Total: 1676.77 MB</code><br>
Change of the amount of the transferred data in relation to the previous call (for eth0).<br> Change of the amount of the transferred data in relation to the previous call (for eth0).<br>
<code>eth0_diff: RX: 0.66 MB, TX: 0.06 MB, Total: 0.72 MB</code><br> <code>eth0_diff: RX: 0.66 MB, TX: 0.06 MB, Total: 0.72 MB</code><br>
IP and IP v6 adresses
<code>eth0_ip 192.168.0.15</code><br>
<code>eth0_ip6 fe85::49:4ff:fe85:f885/64</code><br>
</li> </li>
<br> <br>
<li>File system information<br> <li>File system information<br>
@@ -2640,7 +2684,7 @@ If one (or more) of the multiplier is set to zero, the corresponding readings is
<li>cpu_bogomips<br> <li>cpu_bogomips<br>
CPU Speed: BogoMIPS CPU Speed: BogoMIPS
</li> </li>
<li>cpu_freq<br> <li>cpu_freq (auf den DualCore-Systemen wie Cubietruck auch cpu1_freq)<br>
CPU-Frequenz CPU-Frequenz
</li> </li>
<br> <br>
@@ -2698,6 +2742,9 @@ If one (or more) of the multiplier is set to zero, the corresponding readings is
<code>eth0: RX: 940.58 MB, TX: 736.19 MB, Total: 1676.77 MB</code><br> <code>eth0: RX: 940.58 MB, TX: 736.19 MB, Total: 1676.77 MB</code><br>
&Auml;nderung der &uuml;bertragenen Datenmenge in Bezug auf den vorherigen Aufruf (f&uuml;r eth0).<br> &Auml;nderung der &uuml;bertragenen Datenmenge in Bezug auf den vorherigen Aufruf (f&uuml;r eth0).<br>
<code>eth0_diff: RX: 0.66 MB, TX: 0.06 MB, Total: 0.72 MB</code><br> <code>eth0_diff: RX: 0.66 MB, TX: 0.06 MB, Total: 0.72 MB</code><br>
IP and IP v6 Adressen
<code>eth0_ip 192.168.0.15</code><br>
<code>eth0_ip6 fe85::49:4ff:fe85:f885/64</code><br>
</li> </li>
<br> <br>
<li>Dateisysteminformationen<br> <li>Dateisysteminformationen<br>