From 89ad528c15159f2c21216875d2db1c89a9f12f62 Mon Sep 17 00:00:00 2001 From: betateilchen <> Date: Sun, 28 May 2017 09:02:12 +0000 Subject: [PATCH] : git-svn-id: https://svn.fhem.de/fhem/trunk@14395 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/statistics/2017/98_fheminfo2.pm | 388 ------------------- 1 file changed, 388 deletions(-) delete mode 100644 fhem/contrib/statistics/2017/98_fheminfo2.pm diff --git a/fhem/contrib/statistics/2017/98_fheminfo2.pm b/fhem/contrib/statistics/2017/98_fheminfo2.pm deleted file mode 100644 index 5d194a7a8..000000000 --- a/fhem/contrib/statistics/2017/98_fheminfo2.pm +++ /dev/null @@ -1,388 +0,0 @@ -=for comment - -$Id$ - -This script free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -any later version. - -The GNU General Public License can be found at -http://www.gnu.org/copyleft/gpl.html. -A copy is found in the textfile GPL.txt and important notices to the license -from the author is found in LICENSE.txt distributed with these scripts. - -This script is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -=cut - -package main; -use strict; -use warnings; -use Config; -use HttpUtils; - -my %fhemInfo =(); - -sub fheminfo_Initialize($$) { - my %hash = ( - Fn => "CommandFheminfo2", - uri => "https://fhem.de/stats/statistics2.cgi", - Hlp => "[send],show or send Fhem statistics", - ); - $cmds{fheminfo} = \%hash; -} - -sub CommandFheminfo($$) { - my ($cl,$param) = @_; - my @args = split("[ \t]+", $param); - $args[0] = defined($args[0]) ? lc($args[0]) : ""; - my $doSend = ($args[0] eq 'send') ? 1 : 0; - - return "Unknown argument $args[0], usage: fheminfo2 [send]" - if($args[0] ne "send" && $args[0] ne ""); - - return "Won't send, as sendStatistics is set to 'never'." - if($doSend && lc(AttrVal("global","sendStatistics","")) eq "never"); - - _fi2_Count(); - - _fi2_Send() if $args[0] eq 'send'; - - return _fi2_TelnetTable($doSend) if ($cl && $cl->{TYPE} eq 'telnet'); - return _fi2_HtmlTable($doSend); -} - -################################################################ -# tools -# -sub _fi2_Count() { - my $uniqueID = getUniqueId(); - my $release = "5.8"; - my $feature = $featurelevel ? $featurelevel : $release; - my $os = $^O; - my $arch = $Config{"archname"}; - my $perl = sprintf("%vd", $^V); - - %fhemInfo = (); - - $fhemInfo{'system'}{'uniqueID'} = $uniqueID; - $fhemInfo{'system'}{'release'} = $release; - $fhemInfo{'system'}{'feature'} = $feature; - $fhemInfo{'system'}{'os'} = $os; - $fhemInfo{'system'}{'arch'} = $arch; - $fhemInfo{'system'}{'perl'} = $perl; - - foreach my $key ( keys %defs ) - { - my $name = $defs{$key}{NAME}; - my $type = $defs{$key}{TYPE}; - my $model = 'noModel'; - $model = defined($defs{$key}{model}) ? $defs{$key}{model} : $model; - $model = defined($defs{$key}{MODEL}) ? $defs{$key}{MODEL} : $model; - $model = AttrVal($name,'model',$model); -# $model = ReadingsVal($name,'type',$model); - $model = ReadingsVal($name,'model',$model); - $fhemInfo{$type}{$model}++ - unless (defined($defs{$key}{'chanNo'}) || $name =~ m/^unknown_/); # exclude Homematic specials - } - - return; -} - -sub _fi2_Send() { -# my $json = _fi2_to_json(\%fhemInfo); - my $json = toJSON(\%fhemInfo); - - Log3("fheminfo",4,"fheminfo: $json"); - - my %hu_hash = (); - $hu_hash{url} = $cmds{fheminfo2}{uri}; - $hu_hash{data} = "uniqueID=".$fhemInfo{'system'}{'uniqueID'}."&json=$json"; - $hu_hash{header} = "User-Agent: FHEM/".$fhemInfo{'system'}{'release'}; - $hu_hash{callback} = sub($$$) { - my ($hash, $err, $data) = @_; - if($err) { - Log 1, "fheminfo send: Server ERROR: $err"; - } else { - Log3("fheminfo",4,"fheminfo send: Server RESPONSE: $data"); - } - }; - HttpUtils_NonblockingGet(\%hu_hash); - return; -} - -sub _fi2_TelnetTable($) { - my ($doSend) = shift; - my $upTime = _fi2_Uptime(); - my $str = "Following statistics data will be sent to server:\n(see Logfile for server response)\n\n" if($doSend == 1); - $str .= "System Info\n"; - $str .= sprintf(" Release%*s: %s\n",6," ",$fhemInfo{'system'}{'release'}); - $str .= sprintf(" FeatureLevel%*s: %s\n",0," ",$fhemInfo{'system'}{'feature'}); - $str .= sprintf(" OS%*s: %s\n",11," ",$fhemInfo{'system'}{'os'}); - $str .= sprintf(" Arch%*s: %s\n",9," ",$fhemInfo{'system'}{'arch'}); - $str .= sprintf(" Perl%*s: %s\n",9," ",$fhemInfo{'system'}{'perl'}); - $str .= sprintf(" uniqueID%*s: %s\n",5," ",$fhemInfo{'system'}{'uniqueID'}); - $str .= sprintf(" upTime%*s: %s\n",7," ",$upTime); - - my @keys = keys %fhemInfo; - foreach my $type (sort @keys) - { - next if $type eq 'system'; - $str .= "\nType: $type "; - $str .= "Count: ".$fhemInfo{$type}{'noModel'} if defined $fhemInfo{$type}{'noModel'}; - $str .= "\n"; - while ( my ($model, $count) = each(%{$fhemInfo{$type}}) ) - { $str .= " $model = $fhemInfo{$type}{$model}\n" unless $model eq 'noModel'; } - } - - return $str; -} - -sub _fi2_HtmlTable($) { - my ($doSend) = shift; - my $upTime = _fi2_Uptime(); - my $result = "
Following statistics data will be sent to server:(see Logfile for server response) | ||
System Info | ||
Release: | $fhemInfo{'system'}{'release'} | |
FeatureLevel: | $fhemInfo{'system'}{'feature'} | |
OS: | $fhemInfo{'system'}{'os'} | |
Arch: | $fhemInfo{'system'}{'arch'} | |
Perl: | $fhemInfo{'system'}{'perl'} | |
uniqueId: | $fhemInfo{'system'}{'uniqueID'} | |
upTime: | $upTime | |
Modules | Model | Count |
$type | $fhemInfo{$type}{'noModel'} | |
$model | $fhemInfo{$type}{$model} |
fheminfo [send]
- send
transmitts the collected data
- to a central server in order to support the development of FHEM. The
- transmitted data is processed graphically. The results can be viewed
- on http://fhem.de/stats/statistics.html.
- Based on the IP address, the approximate location is determined with
- an accuracy of about 40-80 km. The IP address is not saved.
- - fhem> fheminfo - Fhem info: - Release : 5.3 - OS : linux - Arch : i686-linux-gnu-thread-multi-64int - Perl : v5.14.2 - uniqueID : 87c5cca38dc75a4f388ef87bdcbfbf6f - - Defined modules: - ACU : 1 - CUL : 1 - CUL_FHTTK : 12 - CUL_HM : 66 - CUL_WS : 3 - FHEM2FHEM : 1 - FHEMWEB : 3 - FHT : 9 - [...] - at : 4 - autocreate : 1 - dummy : 23 - notify : 54 - structure : 3 - telnet : 2 - watchdog : 9 - weblink : 17 - - Defined models per module: - CUL : CUN - CUL_FHTTK : FHT80TF - CUL_HM : HM-CC-TC,HM-CC-VD,HM-LC-DIM1T-CV,HM-LC-DIM1T-FM,HM-LC-SW1-PL,[...] - CUL_WS : S555TH - FHT : fht80b - FS20 : fs20pira,fs20s16,fs20s4a,fs20sd,fs20st - HMS : hms100-mg,hms100-tf,hms100-wd - KS300 : ks300 - OWSWITCH : DS2413 --
send
parameter. They are set on attr global
.
- update
command.
- onUpdate
: transfer of data on every update (recommended setting).
- manually
: manually transfer of data via the fheminfo send
command.
- never
: prevents transmission of data at anytime.
- fheminfo [send]
- send
überträgt die Informationen
- an einen zentralen Server um die Entwicklung von FHEM zu unterstützen.
- Die übermittelten Daten werden grafisch aufbereitet und können auf
- http://fhem.de/stats/statistics.html
- abgerufen werden. Anhand der IP-Adresse wird der ungefähre Standort mit
- einer Genauigkeit von ca. 40-80 km ermittelt. Die IP-Adresse wird nicht gespeichert.
- - fhem> fheminfo - Fhem info: - Release : 5.3 - OS : linux - Arch : i686-linux-gnu-thread-multi-64int - Perl : v5.14.2 - uniqueID : 87c5cca38dc75a4f388ef87bdcbfbf6f - - Defined modules: - ACU : 1 - CUL : 1 - CUL_FHTTK : 12 - CUL_HM : 66 - CUL_WS : 3 - FHEM2FHEM : 1 - FHEMWEB : 3 - FHT : 9 - [...] - at : 4 - autocreate : 1 - dummy : 23 - notify : 54 - structure : 3 - telnet : 2 - watchdog : 9 - weblink : 17 - - Defined models per module: - CUL : CUN - CUL_FHTTK : FHT80TF - CUL_HM : HM-CC-TC,HM-CC-VD,HM-LC-DIM1T-CV,HM-LC-DIM1T-FM,HM-LC-SW1-PL,[...] - CUL_WS : S555TH - FHT : fht80b - FS20 : fs20pira,fs20s16,fs20s4a,fs20sd,fs20st - HMS : hms100-mg,hms100-tf,hms100-wd - KS300 : ks300 - OWSWITCH : DS2413 --
send
genutzt. Sie werden über attr global
gesetzt.
- update
Befehl verwendet.
- onUpdate
: Überträgt die Daten bei jedem Update (empfohlene Einstellung).
- manually
: Manuelle Überträgung der Daten über fheminfo send
.
- never
: Verhindert die Überträgung der Daten.
-