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

32_SYSSTAT.pm: use textField-long for mibs, new attribute snmpVersion

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9457 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme1968
2015-10-15 16:45:32 +00:00
parent eb81cfe07d
commit f1ae6bcb68
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/32_SYSSTAT.pm
View File

@@ -42,7 +42,7 @@ SYSSTAT_Initialize($)
$hash->{GetFn} = "SYSSTAT_Get"; $hash->{GetFn} = "SYSSTAT_Get";
$hash->{AttrFn} = "SYSSTAT_Attr"; $hash->{AttrFn} = "SYSSTAT_Attr";
$hash->{AttrList} = "disable:1 disabledForIntervals raspberrycpufreq:1 raspberrytemperature:0,1,2 synologytemperature:0,1,2 stat:1 uptime:1,2 ssh_user "; $hash->{AttrList} = "disable:1 disabledForIntervals raspberrycpufreq:1 raspberrytemperature:0,1,2 synologytemperature:0,1,2 stat:1 uptime:1,2 ssh_user ";
$hash->{AttrList} .= " snmp:1 mibs" if( $SYSSTAT_hasSNMP ); $hash->{AttrList} .= " snmp:1 mibs:textField-long snmpVersion:1,2" if( $SYSSTAT_hasSNMP );
$hash->{AttrList} .= " filesystems showpercent"; $hash->{AttrList} .= " filesystems showpercent";
$hash->{AttrList} .= " useregex:1" if( $SYSSTAT_hasSysStatistics ); $hash->{AttrList} .= " useregex:1" if( $SYSSTAT_hasSysStatistics );
$hash->{AttrList} .= " $readingFnAttributes"; $hash->{AttrList} .= " $readingFnAttributes";
@@ -132,7 +132,7 @@ SYSSTAT_InitSNMP($)
-hostname => $host, -hostname => $host,
-community => $community, -community => $community,
-port => 161, -port => 161,
-version => 1 -version => AttrVal($name,"snmpVersion",1),
); );
if( $error ) { if( $error ) {
Log3 $name, 2, "$name: $error"; Log3 $name, 2, "$name: $error";
@@ -207,18 +207,23 @@ SYSSTAT_Attr($$$)
$attrVal = "1" if($attrName eq "showpercent"); $attrVal = "1" if($attrName eq "showpercent");
$attrVal = "1" if($attrName eq "raspberrycpufreq"); $attrVal = "1" if($attrName eq "raspberrycpufreq");
my $hash = $defs{$name};
if( $attrName eq "filesystems") { if( $attrName eq "filesystems") {
my $hash = $defs{$name};
my @filesystems = split(",",$attrVal); my @filesystems = split(",",$attrVal);
@{$hash->{filesystems}} = @filesystems; @{$hash->{filesystems}} = @filesystems;
} elsif( $attrName eq "ssh_user") { } elsif( $attrName eq "ssh_user") {
$attr{$name}{$attrName} = $attrVal; $attr{$name}{$attrName} = $attrVal;
my $hash = $defs{$name};
SYSSTAT_InitSys( $hash ) if( $SYSSTAT_hasSysStatistics ); SYSSTAT_InitSys( $hash ) if( $SYSSTAT_hasSysStatistics );
} elsif( $attrName eq "snmpVersion" && $SYSSTAT_hasSNMP ) {
$hash->{$attrName} = $attrVal;
SYSSTAT_InitSNMP( $hash );
} elsif ($attrName eq "snmp" && $SYSSTAT_hasSNMP ) { } elsif ($attrName eq "snmp" && $SYSSTAT_hasSNMP ) {
my $hash = $defs{$name};
if( $cmd eq "set" && $attrVal ne "0" ) { if( $cmd eq "set" && $attrVal ne "0" ) {
$hash->{USE_SNMP} = $attrVal; $hash->{USE_SNMP} = $attrVal;
SYSSTAT_InitSNMP( $hash );
} else { } else {
delete $hash->{USE_SNMP}; delete $hash->{USE_SNMP};
} }