From ae28f0b1b1e584fbe7ee818020a07d647548785f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Kir=C3=B8?= Date: Sun, 20 Mar 2016 20:31:54 +0100 Subject: web.pm spellingmistake jso->json --- include/nms/web.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/nms') diff --git a/include/nms/web.pm b/include/nms/web.pm index 2a5e132..b36d692 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -81,7 +81,7 @@ sub finalize_output { printcc; print "Etag: $hash\n"; - print "Content-Type: text/jso; charset=utf-8\n\n"; + print "Content-Type: text/json; charset=utf-8\n\n"; print JSON::XS::encode_json(\%json); print "\n"; } -- cgit v1.2.3 From e2c018a18d972679160220b6cf76fa1a337e0a08 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Mon, 21 Mar 2016 12:26:00 +0100 Subject: NMS: Fix distro --- include/nms/util.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include/nms') diff --git a/include/nms/util.pm b/include/nms/util.pm index 79598d7..d063bf2 100644 --- a/include/nms/util.pm +++ b/include/nms/util.pm @@ -114,7 +114,13 @@ sub guess_placement { $y = int(759 + 20.5 * $s); $xx = $x + 65; $yy = $y + 14; - + } elsif ($name =~ /^distro(\d)/) { + my $d = ($1); + $src = "distro"; + $x = 292 + $d * 165; + $y = 415; + $xx = $x + 130; + $yy = $y + 20; } else { # Fallback to have _some_ position $src = "random"; -- cgit v1.2.3 From 348d197899f37e535feefd5055ae8ef553a71bdf Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Tue, 22 Mar 2016 23:27:32 +0100 Subject: NMS: "Dirty" hack to get switches.then in switch-state --- include/nms/web.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/nms') diff --git a/include/nms/web.pm b/include/nms/web.pm index b36d692..c9f7236 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -58,13 +58,18 @@ sub db_safe_quote { sub setwhen { $now = "now()"; my $window = '15m'; - if (@_ == 1) { + my $offset = '0s'; + if (@_ > 0) { $window = $_[0]; } + if (@_ > 1) { + $offset = $_[1]; + } if (defined($get_params{'now'})) { $now = db_safe_quote('now') . "::timestamp "; $cc{'max-age'} = "3600"; } + $now = "(" . $now . " - '" . $offset . "'::interval)"; $when = " time > " . $now . " - '".$window."'::interval and time < " . $now . " "; } -- cgit v1.2.3 From 50a9e3fcb3e8e6f3ec13eebe1da8df7bdf7af45c Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Wed, 23 Mar 2016 10:53:45 +0100 Subject: NMS: Bump location and placement --- include/nms/util.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'include/nms') diff --git a/include/nms/util.pm b/include/nms/util.pm index d063bf2..64637b8 100644 --- a/include/nms/util.pm +++ b/include/nms/util.pm @@ -15,10 +15,9 @@ sub parse_switch { 'sysname' => "$switch", 'subnet4' => "$subnet4", 'subnet6' => "$subnet6", - 'mgtmt4' => "$mgtmt4", - 'mgtmt6' => "$mgtmt6", - 'lolid' => "$lolid", - 'ip' => "$mgtmt4", + 'mgmt_v4_addr' => "$mgtmt4", + 'mgmt_v6_addr' => "$mgtmt6", + 'traffic_vlan' => "$lolid", 'distro' => "$distro" ); %{$ret{'placement'}} = guess_placement($switch); @@ -91,7 +90,7 @@ sub guess_placement { $yy -= 20 if ($e >= 79 and $s == 1); $yy -= 30 if ($e >= 81 and $s == 1); - } elsif ($name =~ /^sw(\d+)-creativia$/) { + } elsif ($name =~ /^creativia(\d+)$/) { my ($s) = ($1); $src = "creativia"; $x = 1535; -- cgit v1.2.3 From 28eabb470e5ddfa051ef23be4ca3d89677304331 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Thu, 24 Mar 2016 00:43:05 +0100 Subject: NMS: Tweak SNMP fetching (getting more data) --- include/nms/snmp.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/nms') diff --git a/include/nms/snmp.pm b/include/nms/snmp.pm index b1354ae..26ada44 100644 --- a/include/nms/snmp.pm +++ b/include/nms/snmp.pm @@ -15,7 +15,9 @@ BEGIN { # cd /usr/share/mibs/site # wget -O- ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz | sudo tar --strip-components=3 -zxvvf - SNMP::initMib(); - SNMP::addMibDirs("../mibs"); + SNMP::addMibDirs("/srv/tgmanage/mibs/StandardMibs"); + SNMP::addMibDirs("/srv/tgmanage/mibs/JuniperMibs"); + SNMP::loadModules('SNMPv2-MIB'); SNMP::loadModules('ENTITY-MIB'); SNMP::loadModules('IF-MIB'); -- cgit v1.2.3 From 004f4efcfd0779f4307b90fed139dc87d01ad0b9 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Sat, 26 Mar 2016 03:48:12 +0100 Subject: NMS: Various performance tweaks --- include/nms/web.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/nms') diff --git a/include/nms/web.pm b/include/nms/web.pm index c9f7236..889e774 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -57,7 +57,7 @@ sub db_safe_quote { # endpoints it is better to return no data than old data (e.g.: ping). sub setwhen { $now = "now()"; - my $window = '15m'; + my $window = '8m'; my $offset = '0s'; if (@_ > 0) { $window = $_[0]; @@ -86,6 +86,8 @@ sub finalize_output { printcc; print "Etag: $hash\n"; + print "Access-Control-Allow-Origin: *\n"; + print "Access-Control-Allow-Methods: HEAD, GET\n"; print "Content-Type: text/json; charset=utf-8\n\n"; print JSON::XS::encode_json(\%json); print "\n"; -- cgit v1.2.3