From 56a75f637fef6d485aeddf7ec259e49df0edff22 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Mon, 22 Jun 2009 16:22:47 -0400 Subject: [PATCH 1/3] added output of rrdtool lastupdate Signed-off-by: Mariano Alvira --- rimecollect-rrd/meshstat.cgi | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/rimecollect-rrd/meshstat.cgi b/rimecollect-rrd/meshstat.cgi index c95a1b3a7..f4ba0405e 100755 --- a/rimecollect-rrd/meshstat.cgi +++ b/rimecollect-rrd/meshstat.cgi @@ -10,21 +10,21 @@ use CGI qw/:standard/; # paths my $meshpath = "/home/malvira/work"; my $wwwpath = "/var/www"; -my $hostname = "localhost"; +my $hostname = "hotdog.redwirellc.com"; # aliases my %aliases = ( "2.0" => { alias => "Lower Door", ds=> { - "GPIO29" => "Lock", + "GPIO29" => "Lock (0 - locked, 1 - unlocked)", }, }, "4.0" => { alias => "Upper Door", }, "1.0" => { - alias => "Sink (Hotdog)", + alias => "Hotdog (datasink)", }, ); @@ -42,13 +42,17 @@ foreach my $file (@files) { print h1("$addr: $aliases{$addr}{'alias'}"); my @info = split(/\n/,qx(rrdtool info $meshpath/$addr.rrd)); - my %ds; + my %dses; foreach my $info (@info) { - next if $info !~ /ds\[([\w\d]+)\]/; - $ds{$1}++; + next if $info !~ /ds\[([\w\d]+)\]\.([\w\d_]+)\s+=\s+([\w\d]+)/; + $dses{$1}{$2} = $3; } + + my $lastupdate = qx(rrdtool lastupdate $meshpath/$addr.rrd); + $lastupdate =~ /([\w\d]+)\s+(\d+):\s+([\w\d]+)/; + print gmtime($2) . " $1 $3
"; - foreach my $ds (keys(%ds)) { + foreach my $ds (keys(%dses)) { print h2("$ds: $aliases{$addr}{'ds'}{$ds}"); qx(rrdtool graph $wwwpath/$addr-$ds.png --start end-60min DEF:$ds=$meshpath/$addr.rrd:$ds:LAST LINE2:$ds#00a000:\"$ds\"); print img({src=>"http://$hostname/$addr-$ds.png"}); From 400ea36fce4ffad822df9380b6de3ae1b08c7fba Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Mon, 22 Jun 2009 16:23:36 -0400 Subject: [PATCH 2/3] final rftest2pcap script Signed-off-by: Mariano Alvira --- rftestrx2pcap.pl | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/rftestrx2pcap.pl b/rftestrx2pcap.pl index 73917be9a..2bf58a657 100755 --- a/rftestrx2pcap.pl +++ b/rftestrx2pcap.pl @@ -53,28 +53,32 @@ while(1) { if (defined($count) && ($count != 0)) { $str .= $c; # match if ends in \n or \r and process line - if(($str =~ /\n\r$/) || - ($str =~ /\r\n$/)) { + if(($str =~ /\n$/) || + ($str =~ /\r$/)) { if($str =~ /^rftest/) { #new packet ($sec, $usec) = gettimeofday; -# print "rftestline: $sec $usec $str\n\r"; + print STDERR "rftestline: $sec $usec $str"; } elsif($str =~ /^\s*data/) { #packet payload + print STDERR "dataline: "; + print STDERR $str; $str =~ /data: 0x\d+ (.+)/; my @data = split(' ',$1); -# print "dataline: "; ($len, @data) = @data; -# print "\n\r"; #write out pcap entry print pack('LLLL',($sec,$usec,scalar(@data),scalar(@data)+2)); + print STDERR "new packet: $sec $usec " . scalar(@data) . " " . (scalar(@data)+2) . "\n\r"; @frame = @data[0,1]; - print pack ('CC',($frame[1],$frame[0])); + print pack ('CC',(hex($frame[0]),hex($frame[1]))); + print STDERR "$frame[0] $frame[1] "; foreach my $data (@data[2..scalar(@data)-1]) { print pack ('C',hex($data)); + print STDERR "$data "; } + print STDERR "\n\r"; } - + print STDERR "\n\r"; $str = ''; } } From 5830ea153ec11a2de2e84845d5b7f3e71a21c895 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Mon, 22 Jun 2009 17:06:17 -0400 Subject: [PATCH 3/3] localtime instead of gmtime Signed-off-by: Mariano Alvira --- rimecollect-rrd/meshstat.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rimecollect-rrd/meshstat.cgi b/rimecollect-rrd/meshstat.cgi index f4ba0405e..498c8a4e9 100755 --- a/rimecollect-rrd/meshstat.cgi +++ b/rimecollect-rrd/meshstat.cgi @@ -50,7 +50,7 @@ foreach my $file (@files) { my $lastupdate = qx(rrdtool lastupdate $meshpath/$addr.rrd); $lastupdate =~ /([\w\d]+)\s+(\d+):\s+([\w\d]+)/; - print gmtime($2) . " $1 $3
"; + print localtime($2) . " $1 $3
"; foreach my $ds (keys(%dses)) { print h2("$ds: $aliases{$addr}{'ds'}{$ds}");