Port-state and ping-json2.pl data format bump

2 files changed, 68 insertions, 3 deletions

diff --git a/web/nms.gathering.org/ping-json2.pl b/web/nms.gathering.org/ping-json2.pl
new file mode 100755
index 0000000..ee3d059
--- /dev/null
+++ b/web/nms.gathering.org/ping-json2.pl
@@ -0,0 +1,32 @@
+#! /usr/bin/perl
+use CGI;
+use DBI;
+use JSON::XS;
+use lib '../../include';
+use nms;
+my $cgi = CGI->new;
+
+my $dbh = nms::db_connect();
+my %json = ();
+
+my $q = $dbh->prepare("SELECT DISTINCT ON (switch,sysname) switch,sysname, latency_ms FROM ping NATURAL JOIN switches WHERE updated >= NOW() - INTERVAL '15 secs' ORDER BY switch,sysname, updated DESC;");
+$q->execute();
+while (my $ref = $q->fetchrow_hashref()) {
+	$json{'switches'}{$ref->{'sysname'}}{'latency'} = $ref->{'latency_ms'};
+}
+
+my $qs = $dbh->prepare("SELECT DISTINCT ON (switch) switch, latency_ms FROM ping_secondary_ip WHERE updated >= NOW() - INTERVAL '15 secs' ORDER BY switch, updated DESC;");
+$qs->execute();
+while (my $ref = $qs->fetchrow_hashref()) {
+	$json{'switches'}{$ref->{'switch'}}{'latency_secondary'} = $ref->{'latency_ms'};
+}
+
+my $lq = $dbh->prepare("SELECT DISTINCT ON (linknet) linknet, latency1_ms, latency2_ms FROM linknet_ping WHERE updated >= NOW() - INTERVAL '15 secs' ORDER BY linknet, updated DESC;");
+$lq->execute();
+while (my $ref = $lq->fetchrow_hashref()) {
+	$json{'linknets'}{$ref->{'linknet'}} = [ $ref->{'latency1_ms'}, $ref->{'latency2_ms'} ];
+}
+
+$q->execute();
+print $cgi->header(-type=>'text/json; charset=utf-8');
+print JSON::XS::encode_json(\%json);
diff --git a/web/nms.gathering.org/port-state.pl b/web/nms.gathering.org/port-state.pl
index 2abb056..fad926c 100755
--- a/web/nms.gathering.org/port-state.pl
+++ b/web/nms.gathering.org/port-state.pl
@@ -34,7 +34,7 @@ $query .= ') extract(epoch from date_trunc(\'second\',time)) as time,switch,ifna
 foreach $val (@fields) {
 	$query .= ",max($val) as $val";
 }
-$query .= ',switches.sysname from polls2 natural join switches where ' . $when . ' ';
+$query .= ',switches.sysname from polls natural join switches where ' . $when . ' ';
 my $or = "and (";
 my $last = "";
 foreach my $port (@ports) {
@@ -61,10 +61,43 @@ $q->execute();
 my %json = ();
 while (my $ref = $q->fetchrow_hashref()) {
 	foreach $val (@fields) {
-		$json{$ref->{'sysname'}}{'ports'}{$ref->{'ifname'}}{$val} = $ref->{$val};
+		$json{'switches'}{$ref->{'sysname'}}{'ports'}{$ref->{'ifname'}}{$val} = $ref->{$val};
 	}
-	$json{$ref->{'sysname'}}{'ports'}{$ref->{'ifname'}}{'time'} = $ref->{'time'};
+	$json{'switches'}{$ref->{'sysname'}}{'ports'}{$ref->{'ifname'}}{'time'} = $ref->{'time'};
 }
 #print Dumper(%json);
+
+ $q = $dbh->prepare('select switch,sysname,placement,zorder,ip,switchtype,poll_frequency,community,last_updated from switches natural join placements');
+my  $q2 = $dbh->prepare('select distinct on (switch) switch,temp,time,sysname from switch_temp natural join switches order by switch,time desc');
+
+$q->execute();
+while (my $ref = $q->fetchrow_hashref()) {
+	$ref->{'placement'} =~ /\((-?\d+),(-?\d+)\),\((-?\d+),(-?\d+)\)/;
+	my ($x1, $y1, $x2, $y2) = ($1, $2, $3, $4);
+	my $sysname = $ref->{'sysname'};
+	$json{'switches'}{$ref->{'sysname'}}{'switchtype'} = $ref->{'switchtype'};
+	$json{'switches'}{$ref->{'sysname'}}{'management'}{'ip'} = $ref->{'ip'};
+	$json{'switches'}{$ref->{'sysname'}}{'management'}{'poll_frequency'} = $ref->{'poll_frequency'};
+	$json{'switches'}{$ref->{'sysname'}}{'management'}{'community'} = $ref->{'community'};
+	$json{'switches'}{$ref->{'sysname'}}{'management'}{'last_updated'} = $ref->{'last_updated'};
+	$json{'switches'}{$ref->{'sysname'}}{'placement'}{'x'} = $x2;
+	$json{'switches'}{$ref->{'sysname'}}{'placement'}{'y'} = $y2;
+	$json{'switches'}{$ref->{'sysname'}}{'placement'}{'width'} = $x1 - $x2;
+	$json{'switches'}{$ref->{'sysname'}}{'placement'}{'height'} = $y1 - $y2;
+	$json{'switches'}{$ref->{'sysname'}}{'placement'}{'zorder'} = $ref->{'zorder'};
+}
+$q2->execute();
+while (my $ref = $q2->fetchrow_hashref()) {
+	my $sysname = $ref->{'sysname'};
+	$json{'switches'}{$ref->{'sysname'}}{'temp'} = $ref->{'temp'};
+	$json{'switches'}{$ref->{'sysname'}}{'temp_time'} = $ref->{'time'};
+}
+
+$q = $dbh->prepare(' select linknet, (select sysname from switches where switch = switch1) as sysname1, addr1, (select sysname from switches where switch = switch2) as sysname2,addr2 from linknets');
+$q->execute();
+while (my $ref = $q->fetchrow_hashref()) {
+	push @{$json{'linknets'}}, $ref;
+}
+
 print $cgi->header(-type=>'text/json; charset=utf-8');
 print JSON::XS::encode_json(\%json);