From b8314f8319f00c9bb507d67f11ab8e75d1ca659f Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Thu, 10 Mar 2016 18:19:10 +0000 Subject: nms: Fix comments (presumably) --- include/nms/web.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/nms/web.pm') diff --git a/include/nms/web.pm b/include/nms/web.pm index 74f40c1..184cd90 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -12,7 +12,7 @@ package nms::web; use base 'Exporter'; our %get_params; our %json; -our @EXPORT = qw(finalize_output json dbh db_safe_quote %get_params get_input %json); +our @EXPORT = qw(finalize_output json $dbh db_safe_quote %get_params get_input %json); our $dbh; our $now; our $when; -- cgit v1.2.3 From 865dd759a0f14fea418124c2f90a1f7f928938af Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Thu, 10 Mar 2016 20:54:25 +0000 Subject: NMS: Prep for frontend poller-rewrite The biggest thing here is the addition of a generic poller and a generic "hash" from the backend so equality can easily be checked. --- include/nms/web.pm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/nms/web.pm') diff --git a/include/nms/web.pm b/include/nms/web.pm index 184cd90..d22a060 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -7,6 +7,8 @@ use DBI; use Data::Dumper; use JSON; use nms; +use Digest::SHA qw(sha512_base64); +use FreezeThaw qw(freeze); package nms::web; use base 'Exporter'; @@ -62,10 +64,12 @@ sub setwhen { sub finalize_output { my $query; + my $hash = Digest::SHA::sha512_base64(FreezeThaw::freeze(%json)); $query = $dbh->prepare ('select ' . $now . ' as time;'); $query->execute(); $json{'time'} = $query->fetchrow_hashref()->{'time'}; + $json{'hash'} = $hash; printcc; print "Content-Type: text/jso; charset=utf-8\n\n"; -- cgit v1.2.3 From d139059181888f85b1c3c0cd46e4812410eea8f5 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Fri, 11 Mar 2016 12:03:25 +0100 Subject: NMS: Add (back) offset. The use case is primarily about supporting generic ?offset=5m independently from now=2015-04-02T15:00:30. Two reasons for this: 1. It allows easy generic client-side code to get two slightly offset time series. 2. It makes it possible to get the most recent data + an offset without having to refer to set now=(clock) to real time. Also: Untested, so its probably broken. --- include/nms/web.pm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/nms/web.pm') diff --git a/include/nms/web.pm b/include/nms/web.pm index d22a060..ddc1be0 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -58,6 +58,9 @@ sub setwhen { $now = db_safe_quote('now') . "::timestamp "; $cc{'max-age'} = "3600"; } + if (defined($get_params{'offset'})) { + $now = "(" . $now . " - " . db_safe_quote('offset') . "::interval)"; + } $when = " time > " . $now . " - '5m'::interval and time < " . $now . " "; return $when; } -- cgit v1.2.3 From 8b22ddd85a92eddadd679ac1e51fe1792defb241 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Sat, 12 Mar 2016 16:13:31 +0000 Subject: NMS: Do URL decoding and ISO 8601 time formating Finally found something that lacks correctness in postgres. --- include/nms/web.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'include/nms/web.pm') diff --git a/include/nms/web.pm b/include/nms/web.pm index ddc1be0..0f37a59 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -7,8 +7,9 @@ use DBI; use Data::Dumper; use JSON; use nms; -use Digest::SHA qw(sha512_base64); -use FreezeThaw qw(freeze); +use Digest::SHA; +use FreezeThaw; +use URI::Escape; package nms::web; use base 'Exporter'; @@ -58,9 +59,6 @@ sub setwhen { $now = db_safe_quote('now') . "::timestamp "; $cc{'max-age'} = "3600"; } - if (defined($get_params{'offset'})) { - $now = "(" . $now . " - " . db_safe_quote('offset') . "::interval)"; - } $when = " time > " . $now . " - '5m'::interval and time < " . $now . " "; return $when; } @@ -68,7 +66,7 @@ sub setwhen { sub finalize_output { my $query; my $hash = Digest::SHA::sha512_base64(FreezeThaw::freeze(%json)); - $query = $dbh->prepare ('select ' . $now . ' as time;'); + $query = $dbh->prepare('select to_char(' . $now . ', \'YYYY-MM-DD"T"HH24:MI:SS\') as time;'); $query->execute(); $json{'time'} = $query->fetchrow_hashref()->{'time'}; @@ -81,9 +79,10 @@ sub finalize_output { } sub populate_params { - foreach my $hdr (split("&",$ENV{'QUERY_STRING'} || "")) { + my $querystring = $ENV{'QUERY_STRING'} || ""; + foreach my $hdr (split("&",$querystring)) { my ($key, $value) = split("=",$hdr,"2"); - $get_params{$key} = $value; + $get_params{$key} = URI::Escape::uri_unescape($value); } } -- cgit v1.2.3