NMS-changes

7 files changed, 21 insertions, 14 deletions

diff --git a/web/nms.gathering.org/index.html b/web/nms.gathering.org/index.html
index 10e24cb..cd5055d 100644
--- a/web/nms.gathering.org/index.html
+++ b/web/nms.gathering.org/index.html
@@ -17,12 +17,14 @@
       </li>
 
       <br />
+<!--
 
       <li><a href="nettkart-telnet.pl">Nettkart</a>
         <br /><i>Trafikkoversikt /m telnetlink</i>
       </li>
 
       <br />
+-->
 <!--  Kun moderat nyttig når vi har disablet alle webinterfacene...
       <li><a href="nettkart-web.pl">Nettkart</a>
         <br /><i>Trafikkoversikt /m weblink</i>
@@ -41,25 +43,25 @@
       </li>
 
       <br />
-
+<!--
       <li><a href="uplinktrafikkart.pl">Uplink-trafikkart</a>
         <br /><i>Hvem burde hatt mer enn to uplinker</i>
       </li>
 
       <br />
-
+-->
       <li><a href="stromkart.pl">Strømkart</a>
         <br /><i>Hvilke switcher har færre enn fem tilkoblede klienter</i>
       </li>
 
       <br />
-
+<!--
       <li><a href="apkart.pl">Aksesspunkt-kart</a>
         <br /><i>Hvilke aksesspunkter er plugget i</i>
       </li>
 
       <br />
-
+-->
       <!--<li><a href="overlay.pl">Overlay-nettkart</a>
         <br /><i>Teh magic 3D!</i>
       </li> 
@@ -76,18 +78,17 @@
         <br /><i>Se og håndter kommandoer som er utført og fortsatt i køen</i>
       </li>
 
+<!--
       <br />
 
       <li><a href="stempmap.pl">Temperaturkart</a>
         <br /><i>Temperaturkart for switchene</i>
       </li>
-
       <br />
-
       <li><a href="mbd-status.pl">MBD-status</a>
         <br /><i>Hva spiller folk mest?</i>
       </li>
-
+-->
       <br />
 
       <li><a href="ping.html">Ping-kart</a>
diff --git a/web/nms.gathering.org/nettkart.pl b/web/nms.gathering.org/nettkart.pl
index dd27cb9..3e999a9 100755
--- a/web/nms.gathering.org/nettkart.pl
+++ b/web/nms.gathering.org/nettkart.pl
@@ -56,7 +56,7 @@ $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf",
 $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*2.0/4.0, "1 Gbit/sec");
 $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*3.0/4.0, "100 Mbit/sec");
 $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*4.0/4.0, "10 Mbit/sec");
-$text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 700, "NMS (C) 2005-2012 Tech:Server");
+$text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1600, 1000, "NMS (C) 2005-2012 Tech:Server");
 
 my $q = $dbh->prepare("select * from ( SELECT switch,sysname,sum(bytes_in) AS bytes_in,sum(bytes_out) AS bytes_out from switches natural left join get_current_datarate() where ip <> inet '127.0.0.1' group by switch,sysname) t1 natural join placements order by zorder;");
 $q->execute();
@@ -87,7 +87,6 @@ while (my $ref = $q->fetchrow_hashref()) {
 	
 	my $sysname = $ref->{'sysname'};
 	$sysname =~ s/-sekrit//;
-	$sysname =~ s/\..*$//;
 	
 	$ref->{'placement'} =~ /\((\d+),(\d+)\),\((\d+),(\d+)\)/;
 	$img->filledRectangle($3,$4,$1,$2,$clr);
diff --git a/web/nms.gathering.org/portkart.pl b/web/nms.gathering.org/portkart.pl
index 74c19b5..0f1f83e 100755
--- a/web/nms.gathering.org/portkart.pl
+++ b/web/nms.gathering.org/portkart.pl
@@ -26,7 +26,7 @@ $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0,
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*1.0/3.0, "100 Mbit/sec");
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*2.0/3.0, "10 Mbit/sec");
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*3.0/3.0, "1 Mbit/sec");
-$img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 620, "NMS (C) 2005-2007 Tech:Server");
+$img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1600, 1000, "NMS (C) 2005-2007 Tech:Server");
 
 my $q = $dbh->prepare('select switch,port,bytes_in,bytes_out,placement,switchtype from switches natural join placements natural join get_datarate() where switchtype like \'%3100%\'');
 $q->execute();
diff --git a/web/nms.gathering.org/smanagement.pl b/web/nms.gathering.org/smanagement.pl
index f9a172c..485e2b0 100755
--- a/web/nms.gathering.org/smanagement.pl
+++ b/web/nms.gathering.org/smanagement.pl
@@ -148,7 +148,14 @@ print << "EOF";
         <td>Kommando(er):</td>
         <td></td>
 	<td><textarea name="cmd" cols="80" rows="24"></textarea></td>
-	<td>En kommando per linje. Linjer som begynner med ! sørger for at nms ikke venter på normal prompt, men fyrer av gårde neste linje umiddelbart. Kjekt for kommandoer av typen "!save\\nY"</td>
+	<td>
+	  <ul>
+	    <li>En kommando per linje.</li>
+	    <li>Linjer som begynner med ! sørger for at nms ikke venter på normal prompt, men fyrer av gårde neste linje umiddelbart. Kjekt for kommandoer av typen "!save\\nY"</li>
+	    <li>%SYSNAME% erstattes med hostnavnet til switchen</li>
+	    <li>"#require-version 14.1X53-D15.2" avbryter scriptet om versjonen av JunOS ikke er lik 14.1X53-D15.2</li>
+	  </ul>
+	</td>
       </td>
       <tr>
         <td><hr /></td>
diff --git a/web/nms.gathering.org/stromkart.pl b/web/nms.gathering.org/stromkart.pl
index e4b32e0..df92906 100755
--- a/web/nms.gathering.org/stromkart.pl
+++ b/web/nms.gathering.org/stromkart.pl
@@ -30,7 +30,8 @@ my $grn = $img->colorResolve(0, 255, 0);
 my $wht = $img->colorResolve(255, 255, 255);
 my $gry = $img->colorResolve(127, 127, 127);
 
-my $q = $dbh->prepare('select switch,sysname,(select placement from placements where placements.switch=switches.switch) as placement,count((bytes_in > 0 and bytes_out > 0) or null) as active_ports,(max(last_poll_time) >= current_timestamp - interval \'2 minutes\') as fresh from switches natural left join get_current_datarate() natural join placements where switchtype like \'dlink3100%\' group by switch,sysname');
+#my $q = $dbh->prepare('select switch,sysname,(select placement from placements where placements.switch=switches.switch) as placement,count((bytes_in > 0 and bytes_out > 0) or null) as active_ports,(max(last_poll_time) >= current_timestamp - interval \'2 minutes\') as fresh from switches natural left join get_current_datarate() natural join placements where switchtype like \'dlink3100%\' group by switch,sysname');
+my $q = $dbh->prepare(' select switch,sysname,(select placement from placements where placements.switch = switches.switch) as placement,count((operstatus = 1) or null) as active_ports from switches natural left join get_operstatus() natural join placements where ifdescr like \'ge-0/0/%\'  group by switch,sysname');
 $q->execute();
 while (my $ref = $q->fetchrow_hashref()) {
 	my $ports = $ref->{'active_ports'};
diff --git a/web/nms.gathering.org/switches-json.pl b/web/nms.gathering.org/switches-json.pl
index 2ccb247..0930d14 100755
--- a/web/nms.gathering.org/switches-json.pl
+++ b/web/nms.gathering.org/switches-json.pl
@@ -16,7 +16,6 @@ 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'};
-	$sysname =~ s/\..*$//;
 	$json{'switches'}{$ref->{'switch'}} = {
 		sysname => $sysname,
 		x => $x2,
diff --git a/web/nms.gathering.org/uplinktrafikkart.pl b/web/nms.gathering.org/uplinktrafikkart.pl
index 71fa049..97000cf 100755
--- a/web/nms.gathering.org/uplinktrafikkart.pl
+++ b/web/nms.gathering.org/uplinktrafikkart.pl
@@ -41,7 +41,7 @@ $img->rectangle(12,42,33,236,$blk);
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*0.0/2.0, "4 Gbit/sec");
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*1.0/2.0, "2 Gbit/sec");
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*2.0/2.0, "1 Gbit/sec");
-$img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 700, "NMS (C) 2005-2012 Tech:Server");
+$img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1600, 1000, "NMS (C) 2005-2012 Tech:Server");
 
 my $q = $dbh->prepare('select switch,sysname,(select placement from placements where placements.switch=switches.switch) as placement,greatest(sum(bytes_in),sum(bytes_out)) as traffic from switches natural left join get_current_datarate() natural join placements where port between 45 and 48 and switchtype like \'dlink3100%\' group by switch,sysname');
 $q->execute();