diff --git a/AUTHORS.md b/AUTHORS.md index c81e1a7da..ad60a7f79 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -19,6 +19,7 @@ Contributors to LibreNMS: - Alan Gregory (alangregory) - Joubert RedRat (joubertredrat) - Len Lin (Ultra2D) +- Christopher Freas (nwautomator) [1]: http://observium.org/ "Observium web site" diff --git a/Makefile b/Makefile index f7894ab81..986e4d8e3 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ push-dev: push-personal pp: $(GIT) push personal -push-testing: +push-testing pt: $(GIT) push testing update-subtrees: datetime-subtree moment-subtree font-awesome vis diff --git a/callback.php b/callback.php index bbfe57260..2c82b3ef9 100644 --- a/callback.php +++ b/callback.php @@ -16,7 +16,7 @@ $enabled = dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'enabled'" if ($enabled == 1) { if (dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'") == '') { - dbInsert(array('name'=>'uuid','value'=>guidv4(openssl_random_pseudo_bytes(16))),'callback'); + dbInsert(array('name'=>'uuid','value'=>guidv4(openssl_random_pseudo_bytes(16))), 'callback'); } $uuid = dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'"); @@ -72,12 +72,13 @@ if ($enabled == 1) { $submit = array('data'=>$data); $fields = ''; - foreach($submit as $key => $value) { - $fields .= $key . '=' . $value . '&'; + foreach ($submit as $key => $value) { + $fields .= $key . '=' . $value . '&'; } rtrim($fields, '&'); $post = curl_init(); + set_curl_proxy($post); curl_setopt($post, CURLOPT_URL, $config['callback_post']); curl_setopt($post, CURLOPT_POST, count($submit)); curl_setopt($post, CURLOPT_POSTFIELDS, $fields); @@ -89,12 +90,13 @@ if ($enabled == 1) { $fields = "uuid=$uuid"; $clear = curl_init(); + set_curl_proxy($clear); curl_setopt($clear, CURLOPT_URL, $config['callback_clear']); curl_setopt($clear, CURLOPT_POST, count($clear)); curl_setopt($clear, CURLOPT_POSTFIELDS, $fields); curl_setopt($clear, CURLOPT_RETURNTRANSFER, 1); $result = curl_exec($clear); - dbDelete('callback','`name`="uuid"',array()); + dbDelete('callback', '`name`="uuid"', array()); dbUpdate(array('value' => '0'), 'callback', '`name` = "enabled"', array()); } diff --git a/config.php.default b/config.php.default index c98b8677b..479482113 100755 --- a/config.php.default +++ b/config.php.default @@ -41,3 +41,6 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth $config['poller-wrapper']['alerter'] = FALSE; # Uncomment the next line to disable daily updates #$config['update'] = 0; + +# Uncomment to submit callback stats via proxy +#$config['callback_proxy'] = "hostname:port"; diff --git a/doc/General/Changelog.md b/doc/General/Changelog.md index cc025fef6..4233ecd17 100644 --- a/doc/General/Changelog.md +++ b/doc/General/Changelog.md @@ -3,6 +3,11 @@ ####Bug fixes - Fixed ack of worse/better alerts (PR720) - Fixed ORIG_PATH_INFO warnings (PR727) + - Added missing CPU id for Cisco SB (PR744) + - Changed Processors table name to lower case in processors discovery (PR751) + - Fixed alerts path issue (PR756, PR760) + - Supress further port alerts when interface goes down (PR745) + - Fixed login so redirects via 303 when POST data sent (PR775) ####Improvements - New theme support added (light,dark and mono) (PR682,PR683,PR701) @@ -13,6 +18,15 @@ - Update to Foritgate support (PR709) - Added support for UBNT AirOS and AirFibre (PR721,PR730,PR731) - Added support device groups + alerts to be mapped to devices or groups (PR722) + - Added basic Cambium support (PR738) + - Added basic F5 support (PR670) + - Shorten interface names on map (PR752) + - Added PowerCode support (PR762) + - Added Autodiscovery via OSPF (PR772) + - Added visual graph of alert log (PR777) + - Added Callback system to send anonymous stats (PR768) + - More tables converted to use bootgrid (PR729, PR761) + - New Global Cache to store common queries added (PR780) ### Mar 2015 diff --git a/doc/Installation/Installation-(Debian-Ubuntu).md b/doc/Installation/Installation-(Debian-Ubuntu).md index 4df0bfee4..e7a56447c 100644 --- a/doc/Installation/Installation-(Debian-Ubuntu).md +++ b/doc/Installation/Installation-(Debian-Ubuntu).md @@ -182,6 +182,8 @@ so that it looks like this: That's it! You now should be able to log in to http://librenms.example.com/. Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default. Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps. +It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it. + [1]: https://github.com/Atrato/observium-poller-wrapper [2]: http://git-scm.com/book [3]: http://gitready.com/ diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md index e8a17014d..e7b3d4998 100644 --- a/doc/Installation/Installation-(RHEL-CentOS).md +++ b/doc/Installation/Installation-(RHEL-CentOS).md @@ -216,3 +216,5 @@ so that it looks like this: ### Install complete ### That's it! You now should be able to log in to http://librenms.example.com/. Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default. Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps. + +It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it. diff --git a/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md b/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md index 196654283..3d95a539a 100644 --- a/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md +++ b/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md @@ -158,3 +158,5 @@ so that it looks like this: ### Install complete ### That's it! You now should be able to log in to http://librenms.example.com/. Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default. Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps. + +It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it. diff --git a/html/css/styles.css b/html/css/styles.css index 8bfce8f92..61a546dfb 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1606,7 +1606,7 @@ tr.search:nth-child(odd) { height: 600px; } -.75pc-width { +.threeqtr-width { display:block; width: 75%; } diff --git a/html/csv.php b/html/csv.php new file mode 100644 index 000000000..1f9dee0ca --- /dev/null +++ b/html/csv.php @@ -0,0 +1,52 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +if (strpos($_SERVER['PATH_INFO'], "debug")) +{ + $debug = "1"; + ini_set('display_errors', 1); + ini_set('display_startup_errors', 1); + ini_set('log_errors', 1); + ini_set('error_reporting', E_ALL); +} else { + $debug = FALSE; + ini_set('display_errors', 0); + ini_set('display_startup_errors', 0); + ini_set('log_errors', 0); + ini_set('error_reporting', 0); +} + +include "../includes/defaults.inc.php"; +include "../config.php"; +include_once "../includes/definitions.inc.php"; +include "../includes/functions.php"; +include "includes/functions.inc.php"; +include "includes/vars.inc.php"; +include "includes/authenticate.inc.php"; + +$report = mres($vars['report']); +if( !empty($report) && file_exists("includes/reports/$report.csv.inc.php")) { + if( $debug == false ) { + header("Content-Type: text/csv"); + header('Content-Disposition: attachment; filename="'.$report.'-'.date('Ymd').'.csv"'); + } + $csv = array(); + include_once "includes/reports/$report.csv.inc.php"; + foreach( $csv as $line ) { + echo implode(',',$line)."\n"; + } +} else { + echo "Report not found.\n"; +} +?> diff --git a/html/images/os/datacom.png b/html/images/os/datacom.png new file mode 100644 index 000000000..e4108d8aa Binary files /dev/null and b/html/images/os/datacom.png differ diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index b11033b78..48295cd3e 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -122,7 +122,7 @@ function generate_device_url($device, $vars=array()) return generate_url(array('page' => 'device', 'device' => $device['device_id']), $vars); } -function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end=0, $escape_text=1) +function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end=0, $escape_text=1, $overlib=1) { global $config; @@ -168,7 +168,11 @@ function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end } if ($escape_text) { $text = htmlentities($text); } - $link = overlib_link($url, $text, escape_quotes($contents), $class); + if ($overlib == 0) { + $link = $contents; + } else { + $link = overlib_link($url, $text, escape_quotes($contents), $class); + } if (device_permitted($device['device_id'])) { @@ -404,7 +408,7 @@ function generate_entity_link($type, $entity, $text = NULL, $graph_type=NULL) } -function generate_port_link($port, $text = NULL, $type = NULL) +function generate_port_link($port, $text = NULL, $type = NULL, $overlib = 1, $single_graph = 0) { global $config; @@ -429,17 +433,21 @@ function generate_port_link($port, $text = NULL, $type = NULL) $graph_array['from'] = $config['time']['day']; $graph_array['id'] = $port['port_id']; $content .= generate_graph_tag($graph_array); - $graph_array['from'] = $config['time']['week']; - $content .= generate_graph_tag($graph_array); - $graph_array['from'] = $config['time']['month']; - $content .= generate_graph_tag($graph_array); - $graph_array['from'] = $config['time']['year']; - $content .= generate_graph_tag($graph_array); + if ($single_graph == 0) { + $graph_array['from'] = $config['time']['week']; + $content .= generate_graph_tag($graph_array); + $graph_array['from'] = $config['time']['month']; + $content .= generate_graph_tag($graph_array); + $graph_array['from'] = $config['time']['year']; + $content .= generate_graph_tag($graph_array); + } $content .= ""; $url = generate_port_url($port); - if (port_permitted($port['port_id'], $port['device_id'])) { + if ($overlib == 0) { + return $content; + } elseif (port_permitted($port['port_id'], $port['device_id'])) { return overlib_link($url, $text, $content, $class); } else { return fixifName($text); @@ -744,4 +752,12 @@ function shorten_interface_type($string) { ); } +function clean_bootgrid($string) { + + $output = str_replace(array("\r","\n"), "", $string); + $output = addslashes($output); + return $output; + +} + ?> diff --git a/html/includes/graphs/device/ucd_cpu.inc.php b/html/includes/graphs/device/ucd_cpu.inc.php index 49af3fba0..3068bba69 100644 --- a/html/includes/graphs/device/ucd_cpu.inc.php +++ b/html/includes/graphs/device/ucd_cpu.inc.php @@ -25,7 +25,7 @@ $rrd_options .= " AREA:system_perc#ea8f00:system:STACK"; $rrd_options .= " GPRINT:system_perc:LAST:' %5.2lf%%'"; $rrd_options .= " GPRINT:system_perc:AVERAGE:' %5.2lf%%'"; $rrd_options .= " GPRINT:system_perc:MAX:' %5.2lf%%\\n'"; -$rrd_options .= " AREA:idle_perc#f5f5e5:idle:STACK"; +$rrd_options .= " AREA:idle_perc#f8f8f3:idle:STACK"; $rrd_options .= " GPRINT:idle_perc:LAST:' %5.2lf%%'"; $rrd_options .= " GPRINT:idle_perc:AVERAGE:' %5.2lf%%'"; $rrd_options .= " GPRINT:idle_perc:MAX:' %5.2lf%%\\n'"; diff --git a/html/includes/graphs/generic_data.inc.php b/html/includes/graphs/generic_data.inc.php index 861868ab1..63cc15ceb 100644 --- a/html/includes/graphs/generic_data.inc.php +++ b/html/includes/graphs/generic_data.inc.php @@ -93,16 +93,18 @@ if($format == "octets" || $format == "bytes") $rrd_options .= " COMMENT:'bps Now Ave Max 95th %\\n'"; -$rrd_options .= " AREA:in".$format."_max#aDEB7B:"; -$rrd_options .= " AREA:in".$format."#91B13C:'In '"; +$rrd_options .= " AREA:in".$format."_max#D7FFC7:"; +$rrd_options .= " AREA:in".$format."#90B040:'In '"; +$rrd_options .= " LINE:in".$format."#608720:'In '"; #$rrd_options .= " LINE1.25:in".$format."#006600:'In '"; $rrd_options .= " GPRINT:in".$format.":LAST:%6.2lf%s"; $rrd_options .= " GPRINT:in".$format.":AVERAGE:%6.2lf%s"; $rrd_options .= " GPRINT:in".$format."_max:MAX:%6.2lf%s"; $rrd_options .= " GPRINT:95thin:%6.2lf%s\\\\n"; -$rrd_options .= " AREA:dout".$format."_max#a3b9FF:"; -$rrd_options .= " AREA:dout".$format."#8080BD:'Out'"; +$rrd_options .= " AREA:dout".$format."_max#E0E0FF:"; +$rrd_options .= " AREA:dout".$format."#8080C0:"; +$rrd_options .= " LINE:dout".$format."#606090:'Out'"; #$rrd_options .= " LINE1.25:dout".$format."#000099:Out"; $rrd_options .= " GPRINT:out".$format.":LAST:%6.2lf%s"; $rrd_options .= " GPRINT:out".$format.":AVERAGE:%6.2lf%s"; diff --git a/html/includes/print-debug.php b/html/includes/print-debug.php index 5c23a3536..f35cd05bf 100644 --- a/html/includes/print-debug.php +++ b/html/includes/print-debug.php @@ -47,7 +47,7 @@ foreach ($sql_debug as $sql_error) {
- +
diff --git a/html/includes/print-graph-alerts.inc.php b/html/includes/print-graph-alerts.inc.php index ac4a713f0..6479d7a7d 100644 --- a/html/includes/print-graph-alerts.inc.php +++ b/html/includes/print-graph-alerts.inc.php @@ -19,11 +19,11 @@ if (isset($device['device_id']) && $device['device_id'] > 0) { } if ($_SESSION['userlevel'] >= '5') { - $query = "SELECT DATE(time_logged) Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id $sql GROUP BY DATE(time_logged),alert_rules.severity"; + $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.rule_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity"; } if ($_SESSION['userlevel'] < '5') { - $query = "SELECT DATE(time_logged) Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE(time_logged),alert_rules.severity"; + $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity"; } ?> @@ -86,7 +86,7 @@ echo $max_count; ?> } } }, - zoomMin: 2073600000, //24hrs + zoomMin: 86400, //24hrs zoomMax: \ No newline at end of file + diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index 97ca4a7e2..453a305f1 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -25,12 +25,12 @@ $sql .= ' AND `local_device_id` != 0 AND `remote_device_id` != 0'; $tmp_ids = array(); foreach (dbFetchRows("SELECT DISTINCT least(`devices`.`device_id`, `remote_device_id`) AS `remote_device_id`, GREATEST(`remote_device_id`,`devices`.`device_id`) AS `local_device_id` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` $sql", $sql_array) as $link_devices) { if (!in_array($link_devices['local_device_id'], $tmp_ids) && device_permitted($link_devices['local_device_id'])) { - $link_dev = dbFetchRow("SELECT `hostname`,`location` FROM `devices` WHERE `device_id`=?",array($link_devices['local_device_id'])); - $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>$link_dev['hostname'],'group'=>$link_dev['location']); + $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['local_device_id'])); + $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); } if (!in_array($link_devices['remote_device_id'], $tmp_ids) && device_permitted($link_devices['remote_device_id'])) { - $link_dev = dbFetchRow("SELECT `hostname`,`location` FROM `devices` WHERE `device_id`=?",array($link_devices['remote_device_id'])); - $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>$link_dev['hostname'],'group'=>$link_dev['location']); + $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['remote_device_id'])); + $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); } array_push($tmp_ids,$link_devices['local_device_id']); array_push($tmp_ids,$link_devices['remote_device_id']); @@ -42,11 +42,12 @@ $nodes = json_encode($tmp_devices); if (is_array($tmp_devices[0])) { $tmp_links = array(); - foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.`ifName` AS `local_port`, `remote_port`,`ports`.`ifSpeed` AS ifSpeed FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) { + foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.*, `remote_port` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) { foreach ($tmp_devices as $k=>$v) { if ($v['id'] == $link_devices['local_device_id']) { $from = $v['id']; - $port = shorten_interface_type($link_devices['local_port']); + $port = shorten_interface_type($link_devices['ifName']); + $port_data = $link_devices; } if ($v['id'] == $link_devices['remote_device_id']) { $to = $v['id']; @@ -67,7 +68,20 @@ if (is_array($tmp_devices[0])) { } else { $width = 1; } - $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>$port,'width'=>$width); + $link_in_used = ($link_devices['ifInOctets_rate'] * 8) / $link_devices['ifSpeed'] * 100; + $link_out_used = ($link_devices['ifOutOctets_rate'] * 8) / $link_devices['ifSpeed'] * 100; + if ($link_in_used > $link_out_used) { + $link_used = $link_in_used; + } else { + $link_used = $link_out_used; + } + $link_used = round($link_used, -1); + if ($link_used > 100) { + $link_used = 100; + } + $link_color = $config['map_legend'][$link_used]; + + $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>generate_port_link($port_data, "",'',0,1),'width'=>$width,'color'=>$link_color); } $edges = json_encode($tmp_links); @@ -97,9 +111,26 @@ echo $edges; var data = { nodes: nodes, edges: edges, - stabilize: true + stabilize: false + }; + var options = { + physics: { + barnesHut: { + gravitationalConstant: -80000, springConstant: 0.001, springLength: 200 + } + }, + tooltip: { + color: { + background: '#ffffff' + } + }, + smoothCurves: {dynamic:false, type: "continuous"}, + edges: { + color: { + color: '#000000' + } + } }; - var options = {physics: {barnesHut: {gravitationalConstant: -11900, centralGravity: 1.4, springLength: 203, springConstant: 0.05, damping: 0.3}}, smoothCurves: false}; var network = new vis.Network(container, data, options); network.on("resize", function(params) {console.log(params.width,params.height)}); network.on('click', function (properties) { diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index af4177417..52f1fe486 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -1,4 +1,5 @@ = '10')
  • All Ports
    • 0) { echo('
  • Errored ('.$ports['errored'].')
    • '); } -if (isset($ports['ignored'])) +if ($ports['ignored'] > 0) { echo('
  • Ignored ('.$ports['ignored'].')
    • '); } @@ -431,8 +433,12 @@ Plugins::call('menu'); if ($_SESSION['userlevel'] >= '10') { - echo(' + if (dbFetchCell("SELECT COUNT(*) from `plugins` WHERE plugin_active = '1'") > 0) { + echo(' + '); + } + echo('
  • Plugin Admin
    • '); } diff --git a/html/includes/reports/alert-log.inc.php b/html/includes/reports/alert-log.pdf.inc.php similarity index 100% rename from html/includes/reports/alert-log.inc.php rename to html/includes/reports/alert-log.pdf.inc.php diff --git a/html/includes/reports/example.inc.php b/html/includes/reports/example.pdf.inc.php similarity index 100% rename from html/includes/reports/example.inc.php rename to html/includes/reports/example.pdf.inc.php diff --git a/html/includes/reports/ports.csv.inc.php b/html/includes/reports/ports.csv.inc.php new file mode 100644 index 000000000..5013afd41 --- /dev/null +++ b/html/includes/reports/ports.csv.inc.php @@ -0,0 +1,137 @@ + $value) +{ + if ($value != "") + { + switch ($var) + { + case 'hostname': + $where .= " AND D.hostname LIKE ?"; + $param[] = "%".$value."%"; + break; + case 'location': + $where .= " AND D.location LIKE ?"; + $param[] = "%".$value."%"; + break; + case 'device_id': + $where .= " AND D.device_id = ?"; + $param[] = $value; + break; + case 'deleted': + case 'ignore': + if ($value == 1) + { + $where .= " AND (I.ignore = 1 OR D.ignore = 1) AND I.deleted = 0"; + } + break; + case 'disable': + case 'ifSpeed': + if (is_numeric($value)) + { + $where .= " AND I.$var = ?"; + $param[] = $value; + } + break; + case 'ifType': + $where .= " AND I.$var = ?"; + $param[] = $value; + break; + case 'ifAlias': + case 'port_descr_type': + $where .= " AND I.$var LIKE ?"; + $param[] = "%".$value."%"; + break; + case 'errors': + if ($value == 1) + { + $where .= " AND (I.`ifInErrors_delta` > '0' OR I.`ifOutErrors_delta` > '0')"; + } + break; + case 'state': + if ($value == "down") + { + $where .= "AND I.ifAdminStatus = ? AND I.ifOperStatus = ?"; + $param[] = "up"; + $param[] = "down"; + } elseif($value == "up") { + $where .= "AND I.ifAdminStatus = ? AND I.ifOperStatus = ? AND I.ignore = '0' AND D.ignore='0' AND I.deleted='0'"; + $param[] = "up"; + $param[] = "up"; + } elseif($value == "admindown") { + $where .= "AND I.ifAdminStatus = ? AND D.ignore = 0"; + $param[] = "down"; + } + break; + } + } +} + +$query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ".$query_sort; + +$row = 1; + +list($format, $subformat) = explode("_", $vars['format']); + +$ports = dbFetchRows($query, $param); + +switch ($vars['sort']) +{ + case 'traffic': + $ports = array_sort($ports, 'ifOctets_rate', SORT_DESC); + break; + case 'traffic_in': + $ports = array_sort($ports, 'ifInOctets_rate', SORT_DESC); + break; + case 'traffic_out': + $ports = array_sort($ports, 'ifOutOctets_rate', SORT_DESC); + break; + case 'packets': + $ports = array_sort($ports, 'ifUcastPkts_rate', SORT_DESC); + break; + case 'packets_in': + $ports = array_sort($ports, 'ifInUcastOctets_rate', SORT_DESC); + break; + case 'packets_out': + $ports = array_sort($ports, 'ifOutUcastOctets_rate', SORT_DESC); + break; + case 'errors': + $ports = array_sort($ports, 'ifErrors_rate', SORT_DESC); + break; + case 'speed': + $ports = array_sort($ports, 'ifSpeed', SORT_DESC); + break; + case 'port': + $ports = array_sort($ports, 'ifDescr', SORT_ASC); + break; + case 'media': + $ports = array_sort($ports, 'ifType', SORT_ASC); + break; + case 'descr': + $ports = array_sort($ports, 'ifAlias', SORT_ASC); + break; + case 'device': + default: + $ports = array_sort($ports, 'hostname', SORT_ASC); +} + +$csv[] = array('Device','Port','Speed','Down','Up','Media','Description'); +foreach( $ports as $port ) { + if( port_permitted($port['port_id'], $port['device_id']) ) { + $speed = humanspeed($port['ifSpeed']); + $type = humanmedia($port['ifType']); + $port['in_rate'] = formatRates($port['ifInOctets_rate'] * 8); + $port['out_rate'] = formatRates($port['ifOutOctets_rate'] * 8); + $port = ifLabel($port, $device); + $csv[] = array($port['hostname'],fixIfName($port['label']),$speed,$port['in_rate'],$port['out_rate'],$type,$port['ifAlias']); + } +} +?> diff --git a/html/includes/vars.inc.php b/html/includes/vars.inc.php new file mode 100644 index 000000000..788915f69 --- /dev/null +++ b/html/includes/vars.inc.php @@ -0,0 +1,40 @@ +$get_var) +{ + if (strstr($key, "opt")) + { + list($name, $value) = explode("|", $get_var); + if (!isset($value)) { $value = "yes"; } + $vars[$name] = $value; + } +} + +$segments = explode('/', trim($_SERVER['REQUEST_URI'], '/')); + +foreach ($segments as $pos => $segment) +{ + $segment = urldecode($segment); + if ($pos == "0") + { + $vars['page'] = $segment; + } else { + list($name, $value) = explode("=", $segment); + if ($value == "" || !isset($value)) + { + $vars[$name] = yes; + } else { + $vars[$name] = $value; + } + } +} + +foreach ($_GET as $name => $value) +{ + $vars[$name] = $value; +} + +foreach ($_POST as $name => $value) +{ + $vars[$name] = $value; +} diff --git a/html/index.php b/html/index.php index 43c869f59..9f2a84708 100755 --- a/html/index.php +++ b/html/index.php @@ -12,7 +12,11 @@ * */ -$_SERVER['PATH_INFO'] = !empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : (!empty($_SERVER['ORIG_PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : ''); +if( strstr($_SERVER['SERVER_SOFTWARE'],"nginx") ) { + $_SERVER['PATH_INFO'] = str_replace($_SERVER['PATH_TRANSLATED'].$_SERVER['PHP_SELF'],"",$_SERVER['ORIG_SCRIPT_FILENAME']); +} else { + $_SERVER['PATH_INFO'] = !empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : (!empty($_SERVER['ORIG_PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : ''); +} function logErrors($errno, $errstr, $errfile, $errline) { global $php_debug; @@ -52,6 +56,7 @@ include("../config.php"); include_once("../includes/definitions.inc.php"); include("../includes/functions.php"); include("includes/functions.inc.php"); +include("includes/vars.inc.php"); include('includes/plugins.inc.php'); Plugins::start(); @@ -70,45 +75,6 @@ ob_start(); ini_set('allow_url_fopen', 0); ini_set('display_errors', 0); -foreach ($_GET as $key=>$get_var) -{ - if (strstr($key, "opt")) - { - list($name, $value) = explode("|", $get_var); - if (!isset($value)) { $value = "yes"; } - $vars[$name] = $value; - } -} - -$segments = explode('/', trim($_SERVER['REQUEST_URI'], '/')); - -foreach ($segments as $pos => $segment) -{ - $segment = urldecode($segment); - if ($pos == "0") - { - $vars['page'] = $segment; - } else { - list($name, $value) = explode("=", $segment); - if ($value == "" || !isset($value)) - { - $vars[$name] = yes; - } else { - $vars[$name] = $value; - } - } -} - -foreach ($_GET as $name => $value) -{ - $vars[$name] = $value; -} - -foreach ($_POST as $name => $value) -{ - $vars[$name] = $value; -} - include("includes/authenticate.inc.php"); if (strstr($_SERVER['REQUEST_URI'], 'widescreen=yes')) { $_SESSION['widescreen'] = 1; } @@ -338,7 +304,7 @@ toastr.options.extendedTimeOut = 20; echo(""); } -if (is_array($sql_debug) && is_array($php_debug)) { +if (is_array($sql_debug) && is_array($php_debug) && $_SESSION['authenticated'] === TRUE) { include_once "includes/print-debug.php"; diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php index d65306ff0..9305c519f 100644 --- a/html/pages/devices.inc.php +++ b/html/pages/devices.inc.php @@ -93,6 +93,59 @@ list($format, $subformat) = explode("_", $vars['format']); if($format == "graph") { +$sql_param = array(); + +if(isset($vars['state'])) +{ + if($vars['state'] == 'up') + { + $state = '1'; + } + elseif($vars['state'] == 'down') + { + $state = '0'; + } +} + +if (!empty($vars['hostname'])) { $where .= " AND hostname LIKE ?"; $sql_param[] = "%".$vars['hostname']."%"; } +if (!empty($vars['os'])) { $where .= " AND os = ?"; $sql_param[] = $vars['os']; } +if (!empty($vars['version'])) { $where .= " AND version = ?"; $sql_param[] = $vars['version']; } +if (!empty($vars['hardware'])) { $where .= " AND hardware = ?"; $sql_param[] = $vars['hardware']; } +if (!empty($vars['features'])) { $where .= " AND features = ?"; $sql_param[] = $vars['features']; } +if (!empty($vars['type'])) { + if ($vars['type'] == 'generic') { + $where .= " AND ( type = ? OR type = '')"; $sql_param[] = $vars['type']; + } else { + $where .= " AND type = ?"; $sql_param[] = $vars['type']; + } +} +if (!empty($vars['state'])) { + $where .= " AND status= ?"; $sql_param[] = $state; + $where .= " AND disabled='0' AND `ignore`='0'"; $sql_param[] = ''; +} +if (!empty($vars['disabled'])) { $where .= " AND disabled= ?"; $sql_param[] = $vars['disabled']; } +if (!empty($vars['ignore'])) { $where .= " AND `ignore`= ?"; $sql_param[] = $vars['ignore']; } +if (!empty($vars['location']) && $vars['location'] == "Unset") { $location_filter = ''; } +if (!empty($vars['location'])) { $location_filter = $vars['location']; } +if( !empty($vars['group']) ) { + require_once('../includes/device-groups.inc.php'); + $where .= " AND ( "; + foreach( GetDevicesFromGroup($vars['group']) as $dev ) { + $where .= "device_id = ? OR "; + $sql_param[] = $dev['device_id']; + } + $where = substr($where, 0, strlen($where)-3); + $where .= " )"; +} + +$query = "SELECT * FROM `devices` WHERE 1 "; + +if (isset($where)) { + $query .= $where; +} + +$query .= " ORDER BY hostname"; + $row = 1; foreach (dbFetchRows($query, $sql_param) as $device) { @@ -149,7 +202,7 @@ var grid = $("#devices").bootgrid({ columnSelection: false, formatters: { "status": function(column,row) { - return "

    " + row.msg + "

    "; + return "

    " + row.msg + "

    "; } }, templates: { @@ -165,11 +218,12 @@ var grid = $("#devices").bootgrid({ foreach (dbFetch('SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`') as $data) { if ($data['os']) { - echo('""+'); + echo('">'.$config['os'][$tmp_os]['text'].'"+'); } } ?> @@ -182,11 +236,12 @@ foreach (dbFetch('SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY foreach (dbFetch('SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`') as $data) { if ($data['version']) { - echo('""+'); + echo('">'.$tmp_version.'"+'); } } ?> @@ -199,11 +254,12 @@ foreach (dbFetch('SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version foreach (dbFetch('SELECT `hardware` FROM `devices` AS D WHERE 1 GROUP BY `hardware` ORDER BY `hardware`') as $data) { if ($data['hardware']) { - echo('""+'); + echo('">'.$tmp_hardware.'"+'); } } @@ -219,11 +275,12 @@ foreach (dbFetch('SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `featur { if ($data['features']) { - echo('""+'); + echo('">'.$tmp_features.'"+'); } } @@ -239,6 +296,7 @@ foreach (dbFetch('SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `featur foreach (getlocations() as $location) { if ($location) { + $location = clean_bootgrid($location); echo('"