cleanups to how graphing works. start using device= for device graphs.

git-svn-id: http://www.observium.org/svn/observer/trunk@3167 61d68cd4-352d-0410-923a-c4978735b2b8

html/includes/device-header.inc.php

@@ -38,25 +38,24 @@ echo('
     $graphs = $config['os']['default']['over'];
   }
 
+  $graph_array = array();
   $graph_array['height'] = "100";
   $graph_array['width']  = "310";
   $graph_array['to']     = $config['time']['now'];
-  $graph_array['id']     = $device['device_id'];
+  $graph_array['device'] = $device['device_id'];
   $graph_array['type']   = "device_bits";
   $graph_array['from']   = $config['time']['day'];
   $graph_array['legend'] = "no";
   $graph_array['popup_title'] = $descr;
-#  $graph_array['link']   = generate_device_link($device_id);
-#  print_graph_popup($graph_array);
 
   $graph_array['height'] = "45";
   $graph_array['width']  = "150";
   $graph_array['bg']     = "FFFFFF00";
 
+
   foreach ($graphs as $entry)
   {
     $graph_array['type']   = $entry['graph'];
-    $graphhead = $entry['text'];
 
     echo("<div style='float: right; text-align: center; padding: 1px 5px; margin: 0 1px; background: #f5f5f5;' class='rounded-5px'>");
     print_graph_popup($graph_array);

html/includes/functions.inc.php

@@ -117,8 +117,8 @@ function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end
     $graphhead = $entry['text'];
     $contents .= '<div style="width: 708px">';
     $contents .= '<span style="margin-left: 5px; font-size: 12px; font-weight: bold;">'.$graphhead.'</span><br />';
-    $contents .= "<img src=\"graph.php?id=" . $device['device_id'] . "&amp;from=$start&amp;to=$end&amp;width=275&amp;height=100&amp;type=$graph&amp;legend=no" . '" style="margin: 2px;">';
+    $contents .= "<img src=\"graph.php?device=" . $device['device_id'] . "&amp;from=$start&amp;to=$end&amp;width=275&amp;height=100&amp;type=$graph&amp;legend=no" . '" style="margin: 2px;">';
-    $contents .= "<img src=\"graph.php?id=" . $device['device_id'] . "&amp;from=".$config['time']['week']."&amp;to=$end&amp;width=275&amp;height=100&amp;type=$graph&amp;legend=no" . '" style="margin: 2px;">';
+    $contents .= "<img src=\"graph.php?device=" . $device['device_id'] . "&amp;from=".$config['time']['week']."&amp;to=$end&amp;width=275&amp;height=100&amp;type=$graph&amp;legend=no" . '" style="margin: 2px;">';
     $contents .= '</div>';
   }
 
@@ -169,7 +169,9 @@ function generate_graph_popup($graph_array)
   $content .= generate_graph_tag($graph_array);
   $content .= "</div>";
 
-  $graph_array['link'] = "graphs/type=" . $graph_array['type'] . "/id=" . $graph_array['id'];
+  $graph_array['link'] = generate_url($graph_array, array('page' => 'graphs', 'height' => NULL, 'width' => NULL, 'bg' => NULL));
+
+#  $graph_array['link'] = "graphs/type=" . $graph_array['type'] . "/id=" . $graph_array['id'];
 
   return overlib_link($graph_array['link'], $graph, $content, NULL);
 }

html/includes/graphs/application/auth.inc.php

@@ -1,12 +1,12 @@
 <?php
 
-if (is_numeric($id) && ($config['allow_unauth_graphs'] || application_permitted($id)))
+if (is_numeric($vars['id']) && ($config['allow_unauth_graphs'] || application_permitted($vars['id'])))
 {
-  $app    = get_application_by_id($id);
+  $app    = get_application_by_id($vars['id']);
   $device = device_by_id_cache($app['device_id']);
   $title  = generate_device_link($device);
   $title .= $graph_subtype;
   $auth   = TRUE;
 }
 
-?>
+?>

html/includes/graphs/application/memcached_threads.inc.php

@@ -1,9 +1,8 @@
 <?php
 
-
 include("memcached.inc.php");
 include("includes/graphs/common.inc.php");
-$device = device_by_id_cache($id);
+$device = device_by_id_cache($vars['id']);
 
 include("includes/graphs/common.inc.php");
 

html/includes/graphs/application/memcached_uptime.inc.php

@@ -5,7 +5,7 @@ $scale_min = "0";
 include("memcached.inc.php");
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
+$device = device_by_id_cache($vars['id']);
 
 $rrd_options .= " DEF:uptime=".$rrd_filename.":uptime:AVERAGE";
 $rrd_options .= " CDEF:cuptime=uptime,86400,/";

html/includes/graphs/application/shoutcast_multi_bits.inc.php

@@ -1,5 +1,7 @@
 <?php
 
+$device = device_by_id_cache($vars['id']);
+
 $units           = "b";
 $total_units     = "B";
 $colours_in      = "greens";

html/includes/graphs/application/shoutcast_multi_stats.inc.php

@@ -1,5 +1,7 @@
 <?php
 
+$device = device_by_id_cache($vars['id']);
+
 //$colour     = "random";
 $unit_text  = "ShoutCast Server";
 $total_text = "Total of all ShoutCast Servers";

html/includes/graphs/bgp/auth.inc.php

@@ -1,9 +1,9 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
 
-  $data = dbFetchRow("SELECT * FROM bgpPeers WHERE bgpPeer_id = ?", array($id));
+  $data = dbFetchRow("SELECT * FROM bgpPeers WHERE bgpPeer_id = ?", array($vars['id']));
 
   if (is_numeric($data['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($data['device_id'])))
   {

html/includes/graphs/cefswitching/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-  $cef = dbFetchRow("SELECT * FROM `cef_switching` AS C, `devices` AS D WHERE C.cef_switching_id = ? AND C.device_id = D.device_id", array($id));
+  $cef = dbFetchRow("SELECT * FROM `cef_switching` AS C, `devices` AS D WHERE C.cef_switching_id = ? AND C.device_id = D.device_id", array($vars['id']));
 
   if (is_numeric($cef['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($cef['device_id'])))
   {

html/includes/graphs/customer/auth.inc.php

@@ -1,10 +1,12 @@
 <?php
 
+## FIXME - wtfbbq
+
 if ($_SESSION['userlevel'] >= "5" || $config['allow_unauth_graphs'])
 {
-  $id = mres($_GET['id']);
+  $id = mres($vars['id']);
   $title = generate_device_link($device);
   $auth = TRUE;
 }
 
-?>
+?>

html/includes/graphs/customer/bits.inc.php

@@ -2,7 +2,7 @@
 
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
 $i=0;
-foreach (dbFetchRows("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = ? AND D.device_id = I.device_id", array($id)) as $port)
+foreach (dbFetchRows("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = ? AND D.device_id = I.device_id", array($vars['id'])) as $port)
 {
   if (is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd")))
   {

html/includes/graphs/device/auth.inc.php

@@ -1,8 +1,7 @@
 <?php
 
-if (is_numeric($id) && ($config['allow_unauth_graphs'] || device_permitted($id)))
+if ($config['allow_unauth_graphs'] || device_permitted($device['device_id']))
 {
-  $device = device_by_id_cache($id);
   $title = generate_device_link($device);
   $graph_title = $device['hostname'];
   $auth = TRUE;

html/includes/graphs/device/bits.inc.php

@@ -5,9 +5,7 @@
 $ds_in  = "INOCTETS";
 $ds_out = "OUTOCTETS";
 
-$device = device_by_id_cache($id);
+foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($device['device_id'])) as $port)
-
-foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($id)) as $port)
 {
   $ignore = 0;
   if (is_array($config['device_traffic_iftype']))

html/includes/graphs/device/cras_sessions.inc.php

@@ -4,8 +4,6 @@ $scale_min = "0";
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cras_sessions.rrd";
 
 $rrd_options .= " DEF:email=$rrd_filename:email:AVERAGE";
@@ -48,4 +46,4 @@ $rrd_options .= " GPRINT:lb:LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:lb:AVERAGE:\ %6.2lf%s";
 $rrd_options .= " GPRINT:lb:MAX:\ %6.2lf%s\\\\n";
 
-?>
+?>

html/includes/graphs/device/diskio_common.inc.php

@@ -2,7 +2,7 @@
 
 $i = 1;
 
-foreach (dbFetchRows("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE D.device_id = ? AND U.device_id = D.device_id", array($id)) as $disk)
+foreach (dbFetchRows("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE D.device_id = ? AND U.device_id = D.device_id", array($device['device_id'])) as $disk)
 {
   $rrd_filename = $config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd");
   if (is_file($rrd_filename))

html/includes/graphs/device/hr_processes.inc.php

@@ -2,8 +2,6 @@
 
 $scale_min = "0";
 
-include("includes/graphs/common.inc.php");
-
 $rrd_filename   = $config['rrd_dir'] . "/" . $device['hostname'] . "/hr_processes.rrd";
 
 $ds = "procs";

html/includes/graphs/device/hr_users.inc.php

@@ -2,8 +2,6 @@
 
 $scale_min = "0";
 
-include("includes/graphs/common.inc.php");
-
 $rrd_filename   = $config['rrd_dir'] . "/" . $device['hostname'] . "/hr_users.rrd";
 
 $ds = "users";

html/includes/graphs/device/ipSystemStats.inc.php

@@ -2,8 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename_4 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
 $rrd_filename_6 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
 

html/includes/graphs/device/ipsystemstats_ipv4.inc.php

@@ -2,8 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
 
 $rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
@@ -50,4 +48,4 @@ $rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
 $rrd_options .= " LINE1.25:InReceives#9DaB6B:";
 $rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
 
-?>
+?>

html/includes/graphs/device/ipsystemstats_ipv4_frag.inc.php

@@ -2,8 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
 
 $rrd_options .= " DEF:ipInDelivers=$rrd_filename:InDelivers:AVERAGE";

html/includes/graphs/device/ipsystemstats_ipv6.inc.php

@@ -2,8 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
 
 $rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
@@ -50,4 +48,4 @@ $rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
 $rrd_options .= " LINE1.25:InReceives#9DaB6B:";
 $rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
 
-?>
+?>

html/includes/graphs/device/ipsystemstats_ipv6_frag.inc.php

@@ -2,8 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
 
 $rrd_options .= " DEF:ipInDelivers=$rrd_filename:InDelivers:AVERAGE";
@@ -62,4 +60,4 @@ $rrd_options .= " GPRINT:ReasmReqds:LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:ReasmReqds:AVERAGE:%6.2lf%s";
 $rrd_options .= " GPRINT:MReasmReqds:MAX:%6.2lf%s\\\\n";
 
-?>
+?>

html/includes/graphs/device/mempool.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-$device = device_by_id_cache($id);
-
 include("includes/graphs/common.inc.php");
 
 $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
@@ -9,7 +7,7 @@ $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
 $iter = "1"; $i=1;
 $rrd_options .= " COMMENT:'                           Min   Cur    Max\\n'";
 
-foreach (dbFetchRows("SELECT * FROM `mempools` where `device_id` = ?", array($id)) as $mempool)
+foreach (dbFetchRows("SELECT * FROM `mempools` where `device_id` = ?", array($device['device_id'])) as $mempool)
 {
   #  FIXME generic colour function
   if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }

html/includes/graphs/device/netstat_icmp.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-icmp.rrd";
 

html/includes/graphs/device/netstat_icmp_info.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-icmp.rrd";
 

html/includes/graphs/device/netstat_ip.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
 

html/includes/graphs/device/netstat_ip_frag.inc.php

@@ -2,7 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
 

html/includes/graphs/device/netstat_snmp.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
 

html/includes/graphs/device/netstat_tcp.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-tcp.rrd";
 

html/includes/graphs/device/netstat_udp.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-udp.rrd";
 

html/includes/graphs/device/nfsen_packets.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 $dsdescr = "Packets/s ";
 $dsprefix = "packets_";
 

html/includes/graphs/device/nfsen_traffic.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 $dsdescr = "Byts/s ";
 $dsprefix = "traffic_";
 

html/includes/graphs/device/panos_sessions.inc.php

@@ -2,8 +2,6 @@
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("panos-sessions.rrd");
 
-include("includes/graphs/common.inc.php");
-
 $ds = "sessions";
 
 $colour_area = "9999cc";

html/includes/graphs/device/processor.inc.php

@@ -1,7 +1,6 @@
 <?php
 
-$device = device_by_id_cache($id);
+$procs = dbFetchRows("SELECT * FROM `processors` where `device_id` = ?", array($device['device_id']));
-$procs = dbFetchRows("SELECT * FROM `processors` where `device_id` = ?", array($id));
 
 if($config['os'][$device['os']]['processor_stacked'] == 1)
 {

html/includes/graphs/device/screenos_sessions.inc.php

@@ -1,8 +1,5 @@
 <?php
 
-#$device = device_by_id_cache($id);
-
-include("includes/graphs/common.inc.php");
 
 $file = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("screenos_sessions.rrd");
 
@@ -27,4 +24,4 @@ $scale_min = "0";
 
 include("includes/graphs/generic_multi_line.inc.php");
 
-?>
+?>

html/includes/graphs/device/sensor.inc.php

@@ -2,7 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
 
 if ($_GET['width'] > "300") { $descr_len = "40"; } else { $descr_len = "22"; }
 
@@ -10,7 +9,7 @@ $rrd_options .= " -l 0 -E ";
 $iter = "1";
 $rrd_options .= " COMMENT:'".str_pad($unit_long,$descr_len)."    Cur     Min    Max\\n'";
 
-foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? ORDER BY `sensor_index`", array($class, $id)) as $sensor)
+foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? ORDER BY `sensor_index`", array($class, $device['device_id'])) as $sensor)
 {
   # FIXME generic colour function
   switch ($iter)

html/includes/graphs/device/sla.inc.php

@@ -2,7 +2,9 @@
 
 include("includes/graphs/common.inc.php");
 
-$sla = dbFetchRow("SELECT * FROM `slas` WHERE `sla_id` = ?", array($id));
+### FIXME - THIS IS BROKEN
+
+$sla = dbFetchRow("SELECT * FROM `slas` WHERE `sla_id` = ?", array($vars['id']));
 $device = device_by_id_cache($sla['device_id']);
 
 #if ($_GET['width'] >= "450") { $descr_len = "48"; } else { $descr_len = "21"; }

html/includes/graphs/device/storage.inc.php

@@ -5,12 +5,10 @@ $scale_max = "100";
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $iter = "1";
 $rrd_options .= " COMMENT:'                    Size      Used    %age\\l'";
 
-foreach (dbFetchRows("SELECT * FROM storage where device_id = ?", array($id)) as $storage)
+foreach (dbFetchRows("SELECT * FROM storage where device_id = ?", array($device['device_id'])) as $storage)
 {
   # FIXME generic colour function
   if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }

html/includes/graphs/device/toner.inc.php

@@ -2,13 +2,12 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
 
 $iter = "1";
 $rrd_options .= " COMMENT:'Toner level            Cur     Min      Max\\n'";
-foreach (dbFetchRows("SELECT * FROM toner where device_id = ?", array($id)) as $toner)
+foreach (dbFetchRows("SELECT * FROM toner where device_id = ?", array($device['device_id'])) as $toner)
 {
   $colour = toner2colour($toner['toner_descr']);
 

html/includes/graphs/device/ucd_load.inc.php

@@ -4,8 +4,6 @@ $scale_min = "0";
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_load.rrd";
 
 $rrd_options .= " DEF:1min=$rrd_filename:1min:AVERAGE";

html/includes/graphs/device/ucd_memory.inc.php

@@ -2,8 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
-
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_mem.rrd";
 
 $rrd_options .= " '-b 1024'";
@@ -38,7 +36,6 @@ $rrd_options .= " 'CDEF:shared_perc=shared,totalreal,/,100,*'";
 $rrd_options .= " 'CDEF:buffered_perc=buffered,totalreal,/,100,*'";
 $rrd_options .= " 'CDEF:cached_perc=cached,totalreal,/,100,*'";
 
-
 $rrd_options .= " 'CDEF:cusedswap=usedswap,-1,*'";
 $rrd_options .= " 'CDEF:cdeftot=availreal,shared,buffered,usedreal,cached,usedswap,+,+,+,+,+'";
 $rrd_options .= " 'COMMENT:Bytes         Current   Average   Maximum\\n'";

html/includes/graphs/device/uptime.inc.php

@@ -4,7 +4,6 @@ $scale_min = "0";
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
 

html/includes/graphs/device/vpdn_sessions_l2tp.inc.php

@@ -2,7 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/vpdn-l2tp.rrd";
 

html/includes/graphs/device/vpdn_tunnels_l2tp.inc.php

@@ -2,7 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/vpdn-l2tp.rrd";
 

html/includes/graphs/device/wifi_clients.inc.php

@@ -2,7 +2,6 @@
 
 include("includes/graphs/common.inc.php");
 
-$device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
 

html/includes/graphs/diskio/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-  $disk = dbFetchRow("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE U.diskio_id = ? AND U.device_id = D.device_id", array($id));
+  $disk = dbFetchRow("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE U.diskio_id = ? AND U.device_id = D.device_id", array($vars['id']));
 
   if (is_numeric($disk['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($disk['device_id'])))
   {

html/includes/graphs/graph.inc.php

@@ -2,20 +2,37 @@
 
 function data_uri($file, $mime)
 {
-  $contents = file_get_contents($file);
+  $contents = filevars_contents($file);
   $base64   = base64_encode($contents);
   return ('data:' . $mime . ';base64,' . $base64);
 }
 
-$width    = $_GET['width'];
+// Push $_GET into $vars to be compatible with web interface naming
-$height   = $_GET['height'];
-$title    = $_GET['title'];
-$vertical = $_GET['vertical'];
-$legend   = $_GET['legend'];
-$id       = $_GET['id'];
 
-$from     = (isset($_GET['from']) ? $_GET['from'] : time() - 60*60*24);
+foreach ($_GET as $name => $value)
-$to       = (isset($_GET['to']) ? $_GET['to'] : time());
+{
+  $vars[$name] = $value;
+}
+
+preg_match('/^(?P<type>[A-Za-z0-9]+)_(?P<subtype>.+)/', $vars['type'], $graphtype);
+
+if(is_numeric($vars['device']))
+{
+  $device = device_by_id_cache($vars['device']);
+} elseif(!empty($vars['device'])) {
+  $device = device_by_name($vars['device']);
+}
+
+## FIXME -- remove these
+
+$width    = $vars['width'];
+$height   = $vars['height'];
+$title    = $vars['title'];
+$vertical = $vars['vertical'];
+$legend   = $vars['legend'];
+
+$from     = (isset($vars['from']) ? $vars['from'] : time() - 60*60*24);
+$to       = (isset($vars['to']) ? $vars['to'] : time());
 
 if ($from < 0) { $from = $to + $from; }
 
@@ -25,8 +42,6 @@ $prev_from = $from - $period;
 
 $graphfile = $config['temp_dir'] . "/"  . strgen() . ".png";
 
-preg_match('/^(?P<type>[A-Za-z0-9]+)_(?P<subtype>.+)/', $_GET['type'], $graphtype);
-
 $type = $graphtype['type'];
 $subtype = $graphtype['subtype'];
 
@@ -58,9 +73,9 @@ else
 
 function graph_error($string)
 {
-  global $_GET, $config, $debug, $graphfile;
+  global $vars, $config, $debug, $graphfile;
 
-  $_GET['bg'] = "FFBBBB";
+  $vars['bg'] = "FFBBBB";
 
   include("includes/graphs/common.inc.php");
 

html/includes/graphs/ipsectunnel/auth.inc.php

@@ -1,9 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-
+  $tunnel = dbFetchRow("SELECT * FROM `ipsec_tunnels` AS I, `devices` AS D WHERE I.tunnel_id = ? AND I.device_id = D.device_id", array($vars['id']));
-  $tunnel = dbFetchRow("SELECT * FROM `ipsec_tunnels` AS I, `devices` AS D WHERE I.tunnel_id = ? AND I.device_id = D.device_id", array($id));
 
   if (is_numeric($tunnel['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($tunnel['device_id'])))
   {

html/includes/graphs/location/auth.inc.php

@@ -1,11 +1,11 @@
 <?php
 
-foreach (dbFetchRows("SELECT * FROM `devices` WHERE `location` = ?", array($id)) as $device)
+foreach (dbFetchRows("SELECT * FROM `devices` WHERE `location` = ?", array($vars['id'])) as $device)
 {
   if ($config['allow_unauth_graphs'] || device_permitted($device_id))
   {
     $devices[] = $device;
-    $title = $id;
+    $title = $vars['id'];
     $auth = TRUE;
   }
 }

html/includes/graphs/macaccounting/auth.inc.php

@@ -1,9 +1,9 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
 
-  $acc = dbFetchRow("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = ? AND I.interface_id = M.interface_id AND I.device_id = D.device_id", array($id));
+  $acc = dbFetchRow("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = ? AND I.interface_id = M.interface_id AND I.device_id = D.device_id", array($vars['id']));
 
   if ($debug) {
     echo("<pre>");

html/includes/graphs/mempool/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-  $mempool = dbFetchRow("SELECT * FROM `mempools` AS C, `devices` AS D where C.`mempool_id` = ? AND C.device_id = D.device_id", array($id));
+  $mempool = dbFetchRow("SELECT * FROM `mempools` AS C, `devices` AS D where C.`mempool_id` = ? AND C.device_id = D.device_id", array($vars['id']));
 
   if (is_numeric($mempool['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($mempool['device_id'])))
   {

html/includes/graphs/multiport/auth.inc.php

@@ -2,14 +2,14 @@
 
 $auth = TRUE;
 
-foreach (explode(",", $id) as $ifid)
+foreach (explode(",", $vars['id']) as $ifid)
 {
   if (!$config['allow_unauth_graphs'] && !port_permitted($ifid))
   $auth = FALSE;
 }
 
-#if (is_numeric($id)) {
+#if (is_numeric($vars['id'])) {
-#  $port = get_port_by_id($id);
+#  $port = get_port_by_id($vars['id']);
 #  $device = device_by_id_cache($port['device_id']);
 #}
 
@@ -18,4 +18,4 @@ foreach (explode(",", $id) as $ifid)
 
 $title = "Multi Port :: ";
 
-?>
+?>

html/includes/graphs/multiport/bits.inc.php

@@ -2,7 +2,7 @@
 
 $i = 1;
 
-foreach (explode(",", $id) as $ifid)
+foreach (explode(",", $vars['id']) as $ifid)
 {
   if (strstr($ifid, "!"))
   {

html/includes/graphs/multiport/bits_separate.inc.php

@@ -2,7 +2,7 @@
 
 $i = 0;
 
-foreach (explode(",", $id) as $ifid)
+foreach (explode(",", $vars['id']) as $ifid)
 {
   $port = dbFetchRow("SELECT * FROM `ports` AS I, devices as D WHERE I.interface_id = ? AND I.device_id = D.device_id", array($ifid));
   if (is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd")))

html/includes/graphs/munin/auth.inc.php

@@ -1,23 +1,20 @@
 <?php
 
-if (is_numeric($id))
+  if(is_numeric($vars['plugin']))
-{
+  {
-  $mplug = dbFetchRow("SELECT * FROM `munin_plugins` WHERE `mplug_id` = ?", array($id));
+    $mplug = dbFetchRow("SELECT * FROM `munin_plugins` AS M, `devices` AS D WHERE `mplug_id` = ? AND D.device_id = M.device_id ", array($vars['plugin']));
+  } else {
+    $mplug = dbFetchRow("SELECT * FROM `munin_plugins` AS M, `devices` AS D WHERE M.`device_id` = ? AND `mplug_type` = ?  AND D.device_id = M.device_id", array($device['device_id'], $vars['plugin']));
+  }
 
   if (is_numeric($mplug['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($mplug['device_id'])))
   {
-    $device = device_by_id_cache($mplug['device_id']);
+    $device = &$mplug;
     $title  = generate_device_link($device);
-#    if (!empty($mplug['mplug_instance']))
+    $plugfile = $config['rrd_dir']."/".$device['hostname']."/munin/".$mplug['mplug_type'];
-#    {
+    $title .= " :: Plugin :: " . $mplug['mplug_type']  . " - " . $mplug['mplug_title'];
-#      $plugfile = $config['rrd_dir']."/".$device['hostname']."/munin/".$mplug['mplug_type']."_".$mplug['mplug_instance'];
+
-#      $title .= " :: Plugin :: " . $mplug['mplug_type'] . " :: " . $mplug['mplug_title'];
-#    } else {
-      $plugfile = $config['rrd_dir']."/".$device['hostname']."/munin/".$mplug['mplug_type'];
-      $title .= " :: Plugin :: " . $mplug['mplug_type']  . " - " . $mplug['mplug_title'];
-#    }
     $auth = TRUE;
   }
-}
 
 ?>

html/includes/graphs/netscalervsvr/auth.inc.php

@@ -1,9 +1,9 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
 
-  $vsvr = dbFetchRow("SELECT * FROM `netscaler_vservers` AS I, `devices` AS D WHERE I.vsvr_id = ? AND I.device_id = D.device_id", array($id));
+  $vsvr = dbFetchRow("SELECT * FROM `netscaler_vservers` AS I, `devices` AS D WHERE I.vsvr_id = ? AND I.device_id = D.device_id", array($vars['id']));
 
   if (is_numeric($vsvr['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($vsvr['device_id'])))
   {

html/includes/graphs/port/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id) && ($config['allow_unauth_graphs'] || port_permitted($id)))
+if (is_numeric($vars['id']) && ($config['allow_unauth_graphs'] || port_permitted($vars['id'])))
 {
-  $port   = get_port_by_id($id);
+  $port   = get_port_by_id($vars['id']);
   $device = device_by_id_cache($port['device_id']);
   $title  = generate_device_link($device);
   $title .= " :: Port  ".generate_port_link($port);

html/includes/graphs/processor/auth.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$proc = dbFetchRow("SELECT * FROM `processors` where `processor_id` = ?", array($id));
+$proc = dbFetchRow("SELECT * FROM `processors` where `processor_id` = ?", array($vars['id']));
 
 if (is_numeric($proc['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($proc['device_id'])))
 {

html/includes/graphs/rserver/auth.inc.php

@@ -1,9 +1,9 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
 #  $auth= TRUE;
-  $rserver = dbFetchRow("SELECT * FROM `loadbalancer_rservers` AS I, `devices` AS D WHERE I.rserver_id = ? AND I.device_id = D.device_id", array($id));
+  $rserver = dbFetchRow("SELECT * FROM `loadbalancer_rservers` AS I, `devices` AS D WHERE I.rserver_id = ? AND I.device_id = D.device_id", array($vars['id']));
 
   if (is_numeric($rserver['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($rserver['device_id'])))
   {

html/includes/graphs/sensor/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-  $sensor = dbFetchRow("SELECT * FROM sensors WHERE sensor_id = ?", array($id));
+  $sensor = dbFetchRow("SELECT * FROM sensors WHERE sensor_id = ?", array($vars['id']));
 
   if (is_numeric($sensor['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($sensor['device_id'])))
   {

html/includes/graphs/service/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-  $service = dbFetchRow("SELECT * FROM services WHERE service_id = ?", array($id));
+  $service = dbFetchRow("SELECT * FROM services WHERE service_id = ?", array($vars['id']));
 
   if (is_numeric($service['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($service['device_id'])))
   {

html/includes/graphs/smokeping/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id) && ($config['allow_unauth_graphs'] || device_permitted($id)))
+if (is_numeric($vars['id']) && ($config['allow_unauth_graphs'] || device_permitted($vars['id'])))
 {
-  $device = device_by_id_cache($id);
+  $device = device_by_id_cache($vars['id']);
   $title = generate_device_link($device);
   $graph_title = $device['hostname'];
   $auth = TRUE;

html/includes/graphs/storage/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-  $storage = dbFetchRow("SELECT * FROM `storage` WHERE `storage_id` = ?", array($id));
+  $storage = dbFetchRow("SELECT * FROM `storage` WHERE `storage_id` = ?", array($vars['id']));
 
   if (is_numeric($storage['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($storage['device_id'])))
   {

html/includes/graphs/toner/auth.inc.php

@@ -1,8 +1,8 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
-  $toner = dbFetchRow("SELECT * FROM `toner` WHERE `toner_id` = ?", array($id));
+  $toner = dbFetchRow("SELECT * FROM `toner` WHERE `toner_id` = ?", array($vars['id']));
 
   if (is_numeric($toner['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($toner['device_id'])))
   {

html/includes/graphs/vserver/auth.inc.php

@@ -1,9 +1,9 @@
 <?php
 
-if (is_numeric($id))
+if (is_numeric($vars['id']))
 {
 #  $auth= TRUE;
-  $vserver = dbFetchRow("SELECT * FROM `loadbalancer_vservers` AS I, `devices` AS D WHERE I.classmap_id = ? AND I.device_id = D.device_id", array($id));
+  $vserver = dbFetchRow("SELECT * FROM `loadbalancer_vservers` AS I, `devices` AS D WHERE I.classmap_id = ? AND I.device_id = D.device_id", array($vars['id']));
 
   if (is_numeric($vserver['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($vserver['device_id'])))
   {

html/includes/print-device-graph.php

@@ -1,7 +1,8 @@
 <?php
 
 if(empty($graph_array['type'])) { $graph_array['type'] = $graph_type; }
-if(empty($graph_array['id']))   { $graph_array['id'] = $device['device_id']; }
+if(empty($graph_array['device']))   { $graph_array['device'] = $device['device_id']; }
+
 
 # FIXME not css alternating yet
 if (!is_integer($g_i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }

html/index.php

@@ -61,33 +61,6 @@ foreach ($segments as $pos => $segment)
   {
     $vars['page'] = $segment;
   } else {
-    if (TRUE)  // do this to keep everything working whilst we fiddle --AS
-    { // also, who wrote this? Please check php.net/switch ;) --TL
-      if ($pos == "1")
-      {
-        $_GET['opta'] = $segment;
-      }
-      if ($pos == "2")
-      {
-        $_GET['optb'] = $segment;
-      }
-      if ($pos == "3")
-      {
-        $_GET['optc'] = $segment;
-      }
-      if ($pos == "4")
-      {
-        $_GET['optd'] = $segment;
-      }
-      if ($pos == "5")
-      {
-        $_GET['opte'] = $segment;
-      }
-      if ($pos == "6")
-      {
-        $_GET['optf'] = $segment;
-      }
-    }
     list($name, $value) = explode("=", $segment);
     if ($value == "" || !isset($value))
     {

html/pages/device.inc.php

@@ -91,6 +91,16 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
+    if (@dbFetchCell("SELECT COUNT(mplug_id) FROM munin_plugins WHERE device_id = '" . $device['device_id'] . "'") > '0')
+    {
+      echo('<li class="' . $select['munin'] . '">
+    <a href="'.generate_device_url($device, array('tab' => 'munin')). '">
+      <img src="images/16/chart_line.png" align="absmiddle" border="0" /> Munin
+    </a>
+  </li>');
+    }
+
+
     if (@dbFetchCell("SELECT COUNT(interface_id) FROM ports WHERE device_id = '" . $device['device_id'] . "'") > '0')
     {
       echo('<li class="' . $select['ports'] . $select['port'] . '">

html/pages/device/graphs.inc.php

@@ -17,13 +17,6 @@ echo("<span style='font-weight: bold;'>Graphs</span> &#187; ");
 
 $sep = "";
 
-foreach (dbFetchRows("SELECT * FROM munin_plugins WHERE device_id = ? ORDER BY mplug_category, mplug_type", array($device['device_id'])) as $mplug)
-{
-#  if (strlen($mplug['mplug_category']) == 0) { $mplug['mplug_category'] = "general"; } else {  }
-  $graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['id'] = $mplug['mplug_id'];
-  $graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['title'] = $mplug['mplug_title'];
-}
-
 foreach (dbFetchRows("SELECT * FROM device_graphs WHERE device_id = ? ORDER BY graph", array($device['device_id'])) as $graph)
 {
   $section = $config['graph_types']['device'][$graph['graph']]['section'];
@@ -59,18 +52,11 @@ $graph_enable = $graph_enable[$vars['group']];
 #foreach ($config['graph_types']['device'] as $graph => $entry)
 foreach ($graph_enable as $graph => $entry)
 {
+  $graph_array = array();
   if ($graph_enable[$graph])
   {
-    if (is_numeric($entry['id']))
+    $graph_title = $config['graph_types']['device'][$graph]['descr'];
-    {
+    $graph_array['type'] = "device_" . $graph;
-      $graph_title = $entry['title'];
-      $graph_array['type'] = "munin_graph";
-      $graph_array['id']   = $entry['id'];
-    } else {
-      $graph_title = $config['graph_types']['device'][$graph]['descr'];
-      $graph_array['type'] = "device_" . $graph;
-    }
-
     include("includes/print-device-graph.php");
   }
 }

html/pages/device/graphs/netstats_icmp_info.inc.php

@@ -8,4 +8,4 @@ if (is_file($config['rrd_dir'] . "/" . $device['hostname'] ."/netstats-icmp.rrd"
   include("includes/print-device-graph.php");
 }
 
-?>
+?>

html/pages/device/munin.inc.php

@@ -0,0 +1,76 @@
+<?php
+
+### Sections are printed in the order they exist in $config['graph_sections']
+### Graphs are printed in the order they exist in $config['graph_types']
+
+$link_array = array('page'    => 'device',
+                    'device'  => $device['device_id'],
+                    'tab' => 'munin');
+
+$bg="#ffffff";
+
+echo('<div style="clear: both;">');
+
+print_optionbar_start();
+
+echo("<span style='font-weight: bold;'>Munin</span> &#187; ");
+
+$sep = "";
+
+foreach (dbFetchRows("SELECT * FROM munin_plugins WHERE device_id = ? ORDER BY mplug_category, mplug_type", array($device['device_id'])) as $mplug)
+{
+#  if (strlen($mplug['mplug_category']) == 0) { $mplug['mplug_category'] = "general"; } else {  }
+  $graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['id'] = $mplug['mplug_id'];
+  $graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['title'] = $mplug['mplug_title'];
+  $graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['plugin'] = $mplug['mplug_type'];
+}
+
+foreach ($graph_enable as $section => $nothing)
+{
+  if (isset($graph_enable) && is_array($graph_enable[$section]))
+  {
+    $type = strtolower($section);
+    if (!$vars['group']) { $vars['group'] = $type; }
+    echo($sep);
+    if ($vars['group'] == $type)
+    {
+      echo('<span class="pagemenu-selected">');
+    }
+    echo(generate_link(ucwords($type),$link_array,array('group'=>$type)));
+    if ($vars['group'] == $type)
+    {
+      echo("</span>");
+    }
+    $sep = " | ";
+  }
+}
+
+unset ($sep);
+print_optionbar_end();
+
+$graph_enable = $graph_enable[$vars['group']];
+
+#foreach ($config['graph_types']['device'] as $graph => $entry)
+foreach ($graph_enable as $graph => $entry)
+{
+  $graph_array = array();
+  if ($graph_enable[$graph])
+  {
+    if (!empty($entry['plugin']))
+    {
+      $graph_title = $entry['title'];
+      $graph_array['type'] = "munin_graph";
+      $graph_array['device'] = $device['device_id'];
+      $graph_array['plugin'] = $entry['plugin'];
+    } else {
+      $graph_title = $config['graph_types']['device'][$graph]['descr'];
+      $graph_array['type'] = "device_" . $graph;
+    }
+
+    include("includes/print-device-graph.php");
+  }
+}
+
+$pagetitle[] = "Graphs";
+
+?>

html/pages/device/overview/ports.inc.php

@@ -7,7 +7,7 @@ if ($ports['total'])
   $graph_array['height'] = "100";
   $graph_array['width']  = "485";
   $graph_array['to']     = $config['time']['now'];
-  $graph_array['id']          = $device['device_id'];
+  $graph_array['device']          = $device['device_id'];
   $graph_array['type']   = "device_bits";
   $graph_array['from']   = $config['time']['day'];
   $graph_array['legend'] = "no";

html/pages/graphs.inc.php

@@ -22,6 +22,13 @@ $type = $graphtype['type'];
 $subtype = $graphtype['subtype'];
 $id = $vars['id'];
 
+if(is_numeric($vars['device']))
+{
+  $device = device_by_id_cache($vars['device']);
+} elseif(!empty($vars['device'])) {
+  $device = device_by_name($vars['device']);
+}
+
 if (is_file("includes/graphs/".$type."/auth.inc.php"))
 {
   include("includes/graphs/".$type."/auth.inc.php");

html/pages/packages.inc.php

@@ -7,8 +7,8 @@ foreach ($vars as $var => $value)
     switch ($var)
     {
       case 'name':
-        $where .= " AND `$var` LIKE ?";
+        $where .= " AND `$var` = ?";
-        $param[] = "%".$value."%";
+        $param[] = $value;
         break;
     }
   }
@@ -45,8 +45,12 @@ foreach (dbFetchRows("SELECT * FROM `packages` WHERE 1 $where GROUP BY `name`",
       $content .= "</div>";
     }
     $content .= "</div>";
-
+    if(empty($vars['name']))
-    echo("<span style='margin:5px;'>".overlib_link("", $version, $content,  NULL)."</span>");
+    {
+      echo("<span style='margin:5px;'>".overlib_link("", $version, $content,  NULL)."</span>");
+    } else {
+      echo("$version $content");
+    }
   }
 
   echo("<td>");

includes/common.php

@@ -257,6 +257,7 @@ function ifclass($ifOperStatus, $ifAdminStatus)
 
 function device_by_name($name, $refresh = 0)
 {
+  ## FIXME - cache name > id too.
   return device_by_id_cache(getidbyname($name), $refresh);
 }