From aad9b675c32521cde91b6492fd894c4c06b7662e Mon Sep 17 00:00:00 2001 From: crcro Date: Tue, 6 Sep 2016 02:01:15 +0300 Subject: [PATCH 001/126] more options to amap --- html/css/styles.css | 1 - html/includes/common/availability-map.inc.php | 458 ++++++++---------- html/includes/functions.inc.php | 12 +- html/pages/settings/webui.inc.php | 14 +- sql-schema/133.sql | 3 + 5 files changed, 229 insertions(+), 259 deletions(-) create mode 100644 sql-schema/133.sql diff --git a/html/css/styles.css b/html/css/styles.css index e0b0caef57..7649a3e30a 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1872,7 +1872,6 @@ label { .device-availability, .service-availability { color:#000000; float:left; - width:163px; height:64px; margin:10px; padding:8px; diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php index 80cd4b38da..fefb525830 100644 --- a/html/includes/common/availability-map.inc.php +++ b/html/includes/common/availability-map.inc.php @@ -18,34 +18,164 @@ $select_modes = array( '2' => 'devices and services', ); -if (defined('SHOW_SETTINGS')) { - if (isset($widget_settings['mode'])) { - $mode = $widget_settings['mode']; - } else { - $mode = 0; +require_once 'includes/object-cache.inc.php'; + +$sql = dbFetchRow('SELECT `settings` FROM `users_widgets` WHERE `user_id` = ? AND `widget_id` = ?', array($_SESSION["user_id"], '1')); +$widget_mode = json_decode($sql['settings']); + +if (isset($_SESSION["map_view"])) { + $mode = $_SESSION["map_view"]; +} else { + $mode = $widget_mode->{'mode'}; +} + +$host_up_count = 0; +$host_warn_count = 0; +$host_down_count = 0; +$service_up_count = 0; +$service_warn_count = 0; +$service_down_count = 0; + +if ($config['webui']['availability_map_sort_status'] == 1) { + $deviceOrderBy = 'status'; + $serviceOrderBy = '`S`.`service_status` DESC'; +} else { + $deviceOrderBy = 'hostname'; + $serviceOrderBy = '`D`.`hostname`'; +} + +if ($mode == 0 || $mode == 2) { + // Only show devices if mode is 0 or 2 (Only Devices or both) + if ($config['webui']['availability_map_use_device_groups'] != 0) { + $device_group = 'SELECT `D`.`device_id` FROM `device_group_device` AS `D` WHERE `device_group_id` = ?'; + $param = array($_SESSION['group_view']); + $devices = dbFetchRows($device_group, $param); + foreach ($devices as $in_dev) { + $in_devices[] = $in_dev['device_id']; + } + $in_devices = implode(',', $in_devices); } - if (isset($widget_settings['tile_width'])) { - $current_width = $widget_settings['tile_width']; + $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon` FROM `devices` AS `D`'; + + if (is_normal_user() === true) { + $sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND'; + $param = array( + $_SESSION['user_id'] + ); } else { - $current_width = 10; + $sql .= ' WHERE'; } - $common_output[] = ' -
-
- -
- -
-
-
- -
- '; if ($config['show_services'] == 0) { - $common_output[] = ''; + $temp_header[] = ''; } else { foreach ($select_modes as $mode_select => $option) { if ($mode_select == $mode) { @@ -53,249 +183,71 @@ if (defined('SHOW_SETTINGS')) { } else { $selected = ''; } - $common_output[] = ''; - } - } - $common_output[] =' - -
-
-
-
-
-
'; -} else { - require_once 'includes/object-cache.inc.php'; - - $sql = dbFetchRow('SELECT `settings` FROM `users_widgets` WHERE `user_id` = ? AND `widget_id` = ?', array($_SESSION["user_id"], '1')); - $widget_mode = json_decode($sql['settings']); - - if (isset($_SESSION["map_view"])) { - $mode = $_SESSION["map_view"]; - } else { - $mode = $widget_mode->{'mode'}; - } - - $host_up_count = 0; - $host_warn_count = 0; - $host_down_count = 0; - $service_up_count = 0; - $service_warn_count = 0; - $service_down_count = 0; - - if ($config['webui']['availability_map_sort_status'] == 1) { - $deviceOrderBy = 'status'; - $serviceOrderBy = '`S`.`service_status` DESC'; - } else { - $deviceOrderBy = 'hostname'; - $serviceOrderBy = '`D`.`hostname`'; - } - - if ($mode == 0 || $mode == 2) { - // Only show devices if mode is 0 or 2 (Only Devices or both) - if ($config['webui']['availability_map_use_device_groups'] != 0) { - $device_group = 'SELECT `D`.`device_id` FROM `device_group_device` AS `D` WHERE `device_group_id` = ?'; - $param = array($_SESSION['group_view']); - $devices = dbFetchRows($device_group, $param); - foreach ($devices as $in_dev) { - $in_devices[] = $in_dev['device_id']; - } - $in_devices = implode(',', $in_devices); - } - - $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon` FROM `devices` AS `D`'; - - if (is_normal_user() === true) { - $sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND'; - $param = array( - $_SESSION['user_id'] - ); - } else { - $sql .= ' WHERE'; - } - - - if ($config['webui']['availability_map_use_device_groups'] != 0 && isset($in_devices)) { - $sql .= " `D`.`ignore` = '0' AND `D`.`disabled` = '0' AND `D`.`device_id` IN (".$in_devices.") ORDER BY `".$deviceOrderBy."`"; - } else { - $sql .= " `D`.`ignore` = '0' AND `D`.`disabled` = '0' ORDER BY `".$deviceOrderBy."`"; - } - - $temp_output = array(); - - foreach (dbFetchRows($sql, $param) as $device) { - if ($device['status'] == '1') { - if (($device['uptime'] < $config['uptime_warning']) && ($device['uptime'] != '0')) { - $deviceState = 'warn'; - $deviceLabel = 'label-warning'; - $deviceLabelOld = 'availability-map-oldview-box-warn'; - $host_warn_count++; - } else { - $deviceState = 'up'; - $deviceLabel = 'label-success'; - $deviceLabelOld = 'availability-map-oldview-box-up'; - $host_up_count++; - } - } else { - $deviceState = 'down'; - $deviceLabel = 'label-danger'; - $deviceLabelOld = 'availability-map-oldview-box-down'; - $host_down_count++; - } - - if ($config['webui']['old_availability_map'] == 0) { - if ($directpage == "yes") { - $deviceIcon = getImage($device); - $temp_output[] = ' - -
- '.$deviceState.' - '.$deviceIcon.'
- '.shorthost(ip_to_sysname($device, $device['hostname'])).' -
- '; - } else { - $temp_output[] = ' - - '.$deviceState.' - '; - } - } else { - $temp_output[] = '
'; - } + $temp_header[] = ''; } } - if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { - $service_query = 'select `S`.`service_type`, `S`.`service_id`, `S`.`service_desc`, `S`.`service_status`, `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`os`, `D`.`icon` from services S, devices D where `S`.`device_id` = `D`.`device_id` ORDER BY '.$serviceOrderBy.';'; - $services = dbFetchRows($service_query); - if (count($services) > 0) { - foreach ($services as $service) { - if ($service['service_status'] == '0') { - $serviceLabel = "label-success"; - $serviceLabelOld = 'availability-map-oldview-box-up'; - $serviceState = "up"; - $service_up_count++; - } elseif ($service['service_status'] == '1') { - $serviceLabel = "label-warning"; - $serviceLabelOld = 'availability-map-oldview-box-warn'; - $serviceState = "warn"; - $service_warn_count++; - } else { - $serviceLabel = "label-danger"; - $serviceLabelOld = 'availability-map-oldview-box-down'; - $serviceState = "down"; - $service_down_count++; - } - - if ($config['webui']['old_availability_map'] == 0) { - if ($directpage == "yes") { - $deviceIcon = getImage($service); - $temp_output[] = ' - -
- '.$service["service_type"].' - '.$serviceState.' - '.$deviceIcon.'
- '.shorthost(ip_to_sysname($service, $service['hostname'])).' -
- '; - } else { - $temp_output[] = ' - - '.$service['service_type'].' - '.$serviceState.' - '; - } - } else { - $temp_output[] = '
'; - } - } - } else { - $temp_output [] = ''; - } - } - - if ($directpage == "yes") { - $temp_header[] = ' -
- Availability map for - + $temp_header[] = + '
'; - if (($config['webui']['availability_map_use_device_groups'] != 0) && ($mode == 0 || $mode == 2)) { - $sql = 'SELECT `G`.`id`, `G`.`name` FROM `device_groups` AS `G`'; - $dev_groups = dbFetchRows($sql); + if (($config['webui']['availability_map_use_device_groups'] != 0) && ($mode == 0 || $mode == 2)) { + $sql = 'SELECT `G`.`id`, `G`.`name` FROM `device_groups` AS `G`'; + $dev_groups = dbFetchRows($sql); - if ($_SESSION['group_view'] == 0) { + if ($_SESSION['group_view'] == 0) { + $selected = 'selected'; + } else { + $selected = ''; + } + + $temp_header[] = ' + Device group + - '; - - foreach ($dev_groups as $dev_group) { - if ($_SESSION['group_view'] == $dev_group['id']) { - $selected = 'selected'; - } else { - $selected = ''; - } - $temp_header[] = ''; - } - $temp_header[] = ''; + $temp_header[] = ''; } + $temp_header[] = ''; } - - if ($directpage == "yes") { - $deviceClass = 'page-availability-report-host'; - $serviceClass = 'page-availability-report-host'; - } else { - $deviceClass = 'widget-availability-host'; - $serviceClass = 'widget-availability-service'; - } - - if ($mode == 0 || $mode == 2) { - $temp_header[] = ' -
- Total hosts - up: '.$host_up_count.' - warn: '.$host_warn_count.' - down: '.$host_down_count.' -
'; - } - - if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { - $temp_header[] = ' -
- Total services - up: '.$service_up_count.' - warn: '.$service_warn_count.' - down: '.$service_down_count.' -
'; - } - - $temp_header[] = '
'; - $temp_header[] = '
'; - - $common_output = array_merge($temp_header, $temp_output); } + +if ($directpage == "yes") { + $deviceClass = 'page-availability-report-host'; + $serviceClass = 'page-availability-report-host'; +} else { + $deviceClass = 'widget-availability-host'; + $serviceClass = 'widget-availability-service'; +} + +if ($mode == 0 || $mode == 2) { + $temp_header[] = ' +
+ Total hosts + up: ' . $host_up_count . ' + warn: ' . $host_warn_count . ' + down: ' . $host_down_count . ' +
'; +} + +if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { + $temp_header[] = ' +
+ Total services + up: ' . $service_up_count . ' + warn: ' . $service_warn_count . ' + down: ' . $service_down_count . ' +
'; +} + +$temp_header[] = ''; +$temp_header[] = '
'; + +$common_output = array_merge($temp_header, $temp_output); diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index dfa560ab59..6a8f07b5fb 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -73,8 +73,11 @@ function nicecase($item) case 'nfs-v3-stats': return 'NFS v3 Stats'; - case 'ntpd': - return 'NTPD (Server)'; + case 'ntp-client': + return 'NTP Client'; + + case 'ntp-server': + return 'NTP Server'; case 'os-updates': return 'OS Updates'; @@ -1213,6 +1216,11 @@ function generate_dynamic_config_panel($title, $config_groups, $items = array(), '; + } elseif ($item['type'] == 'numeric') { + $output .= ' + + + '; } elseif ($item['type'] == 'select') { $output .= ' + + +
+
+ +
+
+ '; } else { - $mode = $widget_mode->{'mode'}; -} + require_once 'includes/object-cache.inc.php'; -$host_up_count = 0; -$host_warn_count = 0; -$host_down_count = 0; -$service_up_count = 0; -$service_warn_count = 0; -$service_down_count = 0; + $sql = dbFetchRow('SELECT `settings` FROM `users_widgets` WHERE `user_id` = ? AND `widget_id` = ?', array($_SESSION["user_id"], '1')); + $widget_mode = json_decode($sql['settings']); -if ($config['webui']['availability_map_sort_status'] == 1) { - $deviceOrderBy = 'status'; - $serviceOrderBy = '`S`.`service_status` DESC'; -} else { - $deviceOrderBy = 'hostname'; - $serviceOrderBy = '`D`.`hostname`'; -} - -if ($mode == 0 || $mode == 2) { - // Only show devices if mode is 0 or 2 (Only Devices or both) - if ($config['webui']['availability_map_use_device_groups'] != 0) { - $device_group = 'SELECT `D`.`device_id` FROM `device_group_device` AS `D` WHERE `device_group_id` = ?'; - $param = array($_SESSION['group_view']); - $devices = dbFetchRows($device_group, $param); - foreach ($devices as $in_dev) { - $in_devices[] = $in_dev['device_id']; - } - $in_devices = implode(',', $in_devices); - } - - $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon` FROM `devices` AS `D`'; - - if (is_normal_user() === true) { - $sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND'; - $param = array( - $_SESSION['user_id'] - ); + if (isset($_SESSION["map_view"])) { + $mode = $_SESSION["map_view"]; } else { - $sql .= ' WHERE'; + $mode = $widget_mode->{'mode'}; } + $host_up_count = 0; + $host_warn_count = 0; + $host_down_count = 0; + $service_up_count = 0; + $service_warn_count = 0; + $service_down_count = 0; - if ($config['webui']['availability_map_use_device_groups'] != 0 && isset($in_devices)) { - $sql .= " `D`.`ignore` = '0' AND `D`.`disabled` = '0' AND `D`.`device_id` IN (" . $in_devices . ") ORDER BY `" . $deviceOrderBy . "`"; + if ($config['webui']['availability_map_sort_status'] == 1) { + $deviceOrderBy = 'status'; + $serviceOrderBy = '`S`.`service_status` DESC'; } else { - $sql .= " `D`.`ignore` = '0' AND `D`.`disabled` = '0' ORDER BY `" . $deviceOrderBy . "`"; + $deviceOrderBy = 'hostname'; + $serviceOrderBy = '`D`.`hostname`'; } - $temp_output = array(); - - foreach (dbFetchRows($sql, $param) as $device) { - if ($device['status'] == '1') { - if (($device['uptime'] < $config['uptime_warning']) && ($device['uptime'] != '0')) { - $deviceState = 'warn'; - $deviceLabel = 'label-warning'; - $deviceLabelOld = 'availability-map-oldview-box-warn'; - $host_warn_count++; - } else { - $deviceState = 'up'; - $deviceLabel = 'label-success'; - $deviceLabelOld = 'availability-map-oldview-box-up'; - $host_up_count++; + if ($mode == 0 || $mode == 2) { + // Only show devices if mode is 0 or 2 (Only Devices or both) + if ($config['webui']['availability_map_use_device_groups'] != 0) { + $device_group = 'SELECT `D`.`device_id` FROM `device_group_device` AS `D` WHERE `device_group_id` = ?'; + $param = array($_SESSION['group_view']); + $devices = dbFetchRows($device_group, $param); + foreach ($devices as $in_dev) { + $in_devices[] = $in_dev['device_id']; } - } else { - $deviceState = 'down'; - $deviceLabel = 'label-danger'; - $deviceLabelOld = 'availability-map-oldview-box-down'; - $host_down_count++; + $in_devices = implode(',', $in_devices); } - if ($config['webui']['availability_map_old'] == 0) { - if ($directpage == "yes") { - $deviceIcon = getImage($device); - $temp_output[] = ' + $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon` FROM `devices` AS `D`'; + + if (is_normal_user() === true) { + $sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND'; + $param = array( + $_SESSION['user_id'] + ); + } else { + $sql .= ' WHERE'; + } + + + if ($config['webui']['availability_map_use_device_groups'] != 0 && isset($in_devices)) { + $sql .= " `D`.`ignore` = '0' AND `D`.`disabled` = '0' AND `D`.`device_id` IN (" . $in_devices . ") ORDER BY `" . $deviceOrderBy . "`"; + } else { + $sql .= " `D`.`ignore` = '0' AND `D`.`disabled` = '0' ORDER BY `" . $deviceOrderBy . "`"; + } + + $temp_output = array(); + + foreach (dbFetchRows($sql, $param) as $device) { + if ($device['status'] == '1') { + if (($device['uptime'] < $config['uptime_warning']) && ($device['uptime'] != '0')) { + $deviceState = 'warn'; + $deviceLabel = 'label-warning'; + $deviceLabelOld = 'availability-map-oldview-box-warn'; + $host_warn_count++; + } else { + $deviceState = 'up'; + $deviceLabel = 'label-success'; + $deviceLabelOld = 'availability-map-oldview-box-up'; + $host_up_count++; + } + } else { + $deviceState = 'down'; + $deviceLabel = 'label-danger'; + $deviceLabelOld = 'availability-map-oldview-box-down'; + $host_down_count++; + } + + if ($config['webui']['availability_map_old'] == 0) { + if ($directpage == "yes") { + $deviceIcon = getImage($device); + $temp_output[] = '
' . $deviceState . ' @@ -107,44 +125,44 @@ if ($mode == 0 || $mode == 2) { ' . shorthost(ip_to_sysname($device, $device['hostname'])) . '
'; - } else { - $temp_output[] = ' + } else { + $temp_output[] = ' ' . $deviceState . ' '; + } + } else { + $temp_output[] = '
'; } - } else { - $temp_output[] = '
'; } } -} -if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { - $service_query = 'select `S`.`service_type`, `S`.`service_id`, `S`.`service_desc`, `S`.`service_status`, `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`os`, `D`.`icon` from services S, devices D where `S`.`device_id` = `D`.`device_id` ORDER BY ' . $serviceOrderBy . ';'; - $services = dbFetchRows($service_query); - if (count($services) > 0) { - foreach ($services as $service) { - if ($service['service_status'] == '0') { - $serviceLabel = "label-success"; - $serviceLabelOld = 'availability-map-oldview-box-up'; - $serviceState = "up"; - $service_up_count++; - } elseif ($service['service_status'] == '1') { - $serviceLabel = "label-warning"; - $serviceLabelOld = 'availability-map-oldview-box-warn'; - $serviceState = "warn"; - $service_warn_count++; - } else { - $serviceLabel = "label-danger"; - $serviceLabelOld = 'availability-map-oldview-box-down'; - $serviceState = "down"; - $service_down_count++; - } + if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { + $service_query = 'select `S`.`service_type`, `S`.`service_id`, `S`.`service_desc`, `S`.`service_status`, `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`os`, `D`.`icon` from services S, devices D where `S`.`device_id` = `D`.`device_id` ORDER BY ' . $serviceOrderBy . ';'; + $services = dbFetchRows($service_query); + if (count($services) > 0) { + foreach ($services as $service) { + if ($service['service_status'] == '0') { + $serviceLabel = "label-success"; + $serviceLabelOld = 'availability-map-oldview-box-up'; + $serviceState = "up"; + $service_up_count++; + } elseif ($service['service_status'] == '1') { + $serviceLabel = "label-warning"; + $serviceLabelOld = 'availability-map-oldview-box-warn'; + $serviceState = "warn"; + $service_warn_count++; + } else { + $serviceLabel = "label-danger"; + $serviceLabelOld = 'availability-map-oldview-box-down'; + $serviceState = "down"; + $service_down_count++; + } - if ($config['webui']['availability_map_old'] == 0) { - if ($directpage == "yes") { - $deviceIcon = getImage($service); - $temp_output[] = ' + if ($config['webui']['availability_map_old'] == 0) { + if ($directpage == "yes") { + $deviceIcon = getImage($service); + $temp_output[] = '
' . $service["service_type"] . ' @@ -153,101 +171,102 @@ if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { ' . shorthost(ip_to_sysname($service, $service['hostname'])) . '
'; - } else { - $temp_output[] = ' + } else { + $temp_output[] = ' ' . $service['service_type'] . ' - ' . $serviceState . ' '; + } + } else { + $temp_output[] = '
'; } - } else { - $temp_output[] = '
'; } + } else { + $temp_output [] = ''; } - } else { - $temp_output [] = ''; } -} -if ($directpage == "yes") { - $temp_header[] = ' + if ($directpage == "yes") { + $temp_header[] = '
Availability map for +
+
'; + + if (($config['webui']['availability_map_use_device_groups'] != 0) && ($mode == 0 || $mode == 2)) { + $sql = 'SELECT `G`.`id`, `G`.`name` FROM `device_groups` AS `G`'; + $dev_groups = dbFetchRows($sql); + + if ($_SESSION['group_view'] == 0) { $selected = 'selected'; } else { $selected = ''; } - $temp_header[] = ''; - } - } - $temp_header[] = - ' -
-
'; - - if (($config['webui']['availability_map_use_device_groups'] != 0) && ($mode == 0 || $mode == 2)) { - $sql = 'SELECT `G`.`id`, `G`.`name` FROM `device_groups` AS `G`'; - $dev_groups = dbFetchRows($sql); - - if ($_SESSION['group_view'] == 0) { - $selected = 'selected'; - } else { - $selected = ''; - } - - $temp_header[] = ' + $temp_header[] = ' Device group '; } - $temp_header[] = ''; } -} -if ($directpage == "yes") { - $deviceClass = 'page-availability-report-host'; - $serviceClass = 'page-availability-report-host'; -} else { - $deviceClass = 'widget-availability-host'; - $serviceClass = 'widget-availability-service'; -} + if ($directpage == "yes") { + $deviceClass = 'page-availability-report-host'; + $serviceClass = 'page-availability-report-host'; + } else { + $deviceClass = 'widget-availability-host'; + $serviceClass = 'widget-availability-service'; + } -if ($mode == 0 || $mode == 2) { - $temp_header[] = ' + if ($mode == 0 || $mode == 2) { + $temp_header[] = '
Total hosts up: ' . $host_up_count . ' warn: ' . $host_warn_count . ' down: ' . $host_down_count . '
'; -} + } -if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { - $temp_header[] = ' + if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) { + $temp_header[] = '
Total services up: ' . $service_up_count . ' warn: ' . $service_warn_count . ' down: ' . $service_down_count . '
'; + } + + $temp_header[] = '
'; + $temp_header[] = '
'; + + $common_output = array_merge($temp_header, $temp_output); } - -$temp_header[] = ''; -$temp_header[] = '
'; - -$common_output = array_merge($temp_header, $temp_output); From 23e31bd030a9e3ec437ddc0ec2943ada12965b52 Mon Sep 17 00:00:00 2001 From: crcro Date: Tue, 6 Sep 2016 02:54:13 +0300 Subject: [PATCH 004/126] fix functions.php, sql queries --- html/includes/functions.inc.php | 10 ++-------- sql-schema/133.sql | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 6a8f07b5fb..b4465a5a4f 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -73,14 +73,8 @@ function nicecase($item) case 'nfs-v3-stats': return 'NFS v3 Stats'; - case 'ntp-client': - return 'NTP Client'; - - case 'ntp-server': - return 'NTP Server'; - - case 'os-updates': - return 'OS Updates'; + case 'ntpd': + return 'NTPD (Server)'; case 'powerdns-recursor': return 'PowerDNS Recursor'; diff --git a/sql-schema/133.sql b/sql-schema/133.sql index 6f02164946..b8221686ed 100644 --- a/sql-schema/133.sql +++ b/sql-schema/133.sql @@ -3,4 +3,4 @@ INSERT INTO `config` (`config_name`, `config_value`, `config_default`, `config_d UPDATE `config` SET `config_name` = 'webui.availability_map_old', `config_hidden` = '0' WHERE `config_name` = 'webui.old_availability_map'; UPDATE `config` SET `config_hidden` = '0' WHERE `config_name` = 'webui.availability_map_sort_status'; UPDATE `config` SET `config_descr` = 'Enable usage of device groups filter' WHERE `config_name` = 'webui.availability_map_use_device_groups'; -UPDATE `config` SET `config_descr` = 'Sort devices and services by status` WHERE `config_name` = 'webui.availability_map_sort_status'; +UPDATE `config` SET `config_descr` = 'Sort devices and services by status' WHERE `config_name` = 'webui.availability_map_sort_status'; From d1130818dd4aefeef66306fda7d10258cfd72652 Mon Sep 17 00:00:00 2001 From: crcro Date: Tue, 6 Sep 2016 02:55:29 +0300 Subject: [PATCH 005/126] fix functions.php, sql queries --- html/includes/functions.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index b4465a5a4f..48e933266a 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -76,6 +76,9 @@ function nicecase($item) case 'ntpd': return 'NTPD (Server)'; + case 'os-updates': + return 'OS Updates'; + case 'powerdns-recursor': return 'PowerDNS Recursor'; From 05e0d5cc3ab858966a64ee8bac0f012ee5cedfad Mon Sep 17 00:00:00 2001 From: crcro Date: Wed, 14 Sep 2016 01:31:29 +0300 Subject: [PATCH 006/126] sql reindex --- sql-schema/134.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql-schema/134.sql diff --git a/sql-schema/134.sql b/sql-schema/134.sql new file mode 100644 index 0000000000..b8221686ed --- /dev/null +++ b/sql-schema/134.sql @@ -0,0 +1,6 @@ +INSERT INTO `config` (`config_name`, `config_value`, `config_default`, `config_descr`, `config_group`, `config_group_order`, `config_sub_group`, `config_sub_group_order`, `config_hidden`, `config_disabled`) VALUES('webui.availability_map_direct_tile_size', '200', '165', 'Input desired tile width in pixels for direct page mode', 'webui', 0, 'graph', 0, '0', '0'); +INSERT INTO `config` (`config_name`, `config_value`, `config_default`, `config_descr`, `config_group`, `config_group_order`, `config_sub_group`, `config_sub_group_order`, `config_hidden`, `config_disabled`) VALUES('webui.availability_map_old_widget_tile_size', '60', '10', 'Input desired tile width in pixels for widget mode', 'webui', 0, 'graph', 0, '0', '0'); +UPDATE `config` SET `config_name` = 'webui.availability_map_old', `config_hidden` = '0' WHERE `config_name` = 'webui.old_availability_map'; +UPDATE `config` SET `config_hidden` = '0' WHERE `config_name` = 'webui.availability_map_sort_status'; +UPDATE `config` SET `config_descr` = 'Enable usage of device groups filter' WHERE `config_name` = 'webui.availability_map_use_device_groups'; +UPDATE `config` SET `config_descr` = 'Sort devices and services by status' WHERE `config_name` = 'webui.availability_map_sort_status'; From 7b7b8c0c2cef3087e9714c727f69a758de824e99 Mon Sep 17 00:00:00 2001 From: Bennett Blodinger Date: Wed, 14 Sep 2016 08:23:50 -0400 Subject: [PATCH 007/126] Fix nav icons Remove notification overlap and fix mobile navigation view --- html/css/styles.css | 17 ----------------- html/includes/print-menubar.php | 4 ++-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/html/css/styles.css b/html/css/styles.css index e7a5736cdd..9e6c7f6f68 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1763,23 +1763,6 @@ label { font-weight: normal; } -.nav>li>a.dropdown-toggle { - padding: 15px 6px; -} - -.badge-navbar-user{ - background:red; - border-radius: 40%; - font-size: 65%; - height: auto; - margin: 0; - padding:5px; - position:absolute; - right:-3px; - top:5px; - width: auto; - } - @media only screen and (max-width: 480px) { .thumbnail_graph_table b { font-size : 6px;} .thumbnail_graph_table img { diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 6f59a79cd8..e685e87fb0 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -537,7 +537,7 @@ if (is_file("includes/print-menubar-custom.inc.php")) { if (empty($notifications['count']) && empty($notifications['sticky_count'])) { $style = 'style="background-color:grey; color:white;"'; } - echo(''.($notifications['sticky_count']+$notifications['count']).''); + echo(' User'.($notifications['sticky_count']+$notifications['count']).''); ?>
    @@ -557,7 +557,7 @@ if ($_SESSION['authenticated']) {
  • - + Settings
      Date: Thu, 15 Sep 2016 00:07:03 +0300 Subject: [PATCH 008/126] changed webui and sql from old availability map to compact availability map --- html/pages/settings/webui.inc.php | 16 ++++------------ sql-schema/134.sql | 1 + 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/html/pages/settings/webui.inc.php b/html/pages/settings/webui.inc.php index 3bfc9181b9..e5b39cf1bb 100644 --- a/html/pages/settings/webui.inc.php +++ b/html/pages/settings/webui.inc.php @@ -19,26 +19,18 @@ $graph_conf = array( ); $availability_map_conf = array( - array('name' => 'webui.availability_map_old', - 'descr' => 'Availability map old view', + array('name' => 'webui.availability_map_compact', + 'descr' => 'Availability map compact view', 'type' => 'checkbox', ), array('name' => 'webui.availability_map_sort_status', - 'descr' => 'Device sort by status', + 'descr' => 'Sort devices by status', 'type' => 'checkbox', ), array('name' => 'webui.availability_map_use_device_groups', - 'descr' => 'Device groups filtering', + 'descr' => 'Use device groups filter', 'type' => 'checkbox', ), - array('name' => 'webui.availability_map_direct_tile_size', - 'descr' => 'Direct page tile size', - 'type' => 'numeric', - ), - array('name' => 'webui.availability_map_old_widget_tile_size', - 'descr' => 'Old view widget tile size', - 'type' => 'numeric', - ), ); $dashboard_conf = array( diff --git a/sql-schema/134.sql b/sql-schema/134.sql index b8221686ed..cecdf2a1dd 100644 --- a/sql-schema/134.sql +++ b/sql-schema/134.sql @@ -4,3 +4,4 @@ UPDATE `config` SET `config_name` = 'webui.availability_map_old', `config_hidden UPDATE `config` SET `config_hidden` = '0' WHERE `config_name` = 'webui.availability_map_sort_status'; UPDATE `config` SET `config_descr` = 'Enable usage of device groups filter' WHERE `config_name` = 'webui.availability_map_use_device_groups'; UPDATE `config` SET `config_descr` = 'Sort devices and services by status' WHERE `config_name` = 'webui.availability_map_sort_status'; +UPDATE `config` SET `config_name` = 'webui.availability_map_compact' WHERE `config_name` = 'webui.availability_map_old'; From 0dd523be45f00e8c3346a2ac9a91aa62948fd004 Mon Sep 17 00:00:00 2001 From: crcro Date: Thu, 15 Sep 2016 19:37:52 +0300 Subject: [PATCH 009/126] app-ups-nut update 1 --- .../graphs/application/ups-nut_remaining.inc.php | 6 +++++- .../application/ups-nut_voltage_battery.inc.php | 7 +++++-- html/pages/device/apps/ups-nut.inc.php | 4 ++-- includes/polling/applications/ups-nut.inc.php | 16 ++++++++++------ 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/html/includes/graphs/application/ups-nut_remaining.inc.php b/html/includes/graphs/application/ups-nut_remaining.inc.php index 44c00b1ccd..bbd5ca04ad 100644 --- a/html/includes/graphs/application/ups-nut_remaining.inc.php +++ b/html/includes/graphs/application/ups-nut_remaining.inc.php @@ -13,10 +13,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * +* @version 1.1 * @package LibreNMS * @link http://librenms.org * @copyright 2016 crcro * @author Cercel Valentin +* +* v1 - initial release +* v1.1 - changed description from seconds to minutes */ require 'includes/graphs/common.inc.php'; @@ -27,7 +31,7 @@ $colour_area = 'EEEEEE'; $colour_line = '36393D'; $colour_area_max = 'FFEE99'; $graph_max = 0; -$unit_text = 'Seconds'; +$unit_text = 'Minutes'; $ups_nut = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id'])); if (rrdtool_check_rrd_exists($ups_nut)) { $rrd_filename = $ups_nut; diff --git a/html/includes/graphs/application/ups-nut_voltage_battery.inc.php b/html/includes/graphs/application/ups-nut_voltage_battery.inc.php index 08d2e18927..5221dcb9b4 100644 --- a/html/includes/graphs/application/ups-nut_voltage_battery.inc.php +++ b/html/includes/graphs/application/ups-nut_voltage_battery.inc.php @@ -13,10 +13,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * +* @version 1.1 * @package LibreNMS * @link http://librenms.org * @copyright 2016 crcro * @author Cercel Valentin +* +* v1 - initial release +* v1.1 - removed the battery_low graph */ require 'includes/graphs/common.inc.php'; @@ -33,7 +37,6 @@ $addarea = 1; $transparency = 33; $rrd_filename = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id'])); $array = array( - 'battery_low' => array('descr' => 'Low','colour' => '630606',), 'battery_voltage' => array('descr' => 'Current','colour' => '50C150',), ); @@ -48,7 +51,7 @@ if (rrdtool_check_rrd_exists($rrd_filename)) { $i++; } } else { - echo "file missing: $rrd_filename"; + echo "file missing: ".$rrd_filename; } require 'includes/graphs/generic_v3_multiline_float.inc.php'; diff --git a/html/pages/device/apps/ups-nut.inc.php b/html/pages/device/apps/ups-nut.inc.php index 8dd01b7e2a..ab0eaf8549 100644 --- a/html/pages/device/apps/ups-nut.inc.php +++ b/html/pages/device/apps/ups-nut.inc.php @@ -22,8 +22,8 @@ global $config; //NET-SNMP-EXTEND-MIB::nsExtendOutLine.\"ups-nut\" -$ups_model = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.7.117.112.115.45.110.117.116.5', '-Oqv'); -$ups_serial = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.7.117.112.115.45.110.117.116.6', '-Oqv'); +$ups_model = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.7.117.112.115.45.110.117.116.4', '-Oqv'); +$ups_serial = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.7.117.112.115.45.110.117.116.5', '-Oqv'); $ups_details = $ups_model.' (SN:'.$ups_serial.')'; $graphs = array( diff --git a/includes/polling/applications/ups-nut.inc.php b/includes/polling/applications/ups-nut.inc.php index c19a1f2e23..0b9400cff0 100644 --- a/includes/polling/applications/ups-nut.inc.php +++ b/includes/polling/applications/ups-nut.inc.php @@ -13,10 +13,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * +* @version 1.1 * @package LibreNMS * @link http://librenms.org * @copyright 2016 crcro * @author Cercel Valentin +* +* v1 - initial release +* v1.1 - removed battery_low value +* - corrected line nominal and input values +* - convert seconds to minutes on remaining uptime */ //NET-SNMP-EXTEND-MIB::nsExtendOutputFull."ups-nut" @@ -27,12 +33,11 @@ $ups_nut = snmp_get($device, $oid, '-Oqv'); echo ' '.$name; -list ($charge, $bat_low, $remaining, $bat_volt, $model, $serial, $input_vol, $line_vol, $load) = explode("\n", $ups_nut); +list ($charge, $remaining, $bat_volt, $model, $serial, $input_volt, $line_volt, $load) = explode("\n", $ups_nut); $rrd_name = array('app', $name, $app_id); $rrd_def = array( 'DS:charge:GAUGE:600:0:100', - 'DS:battery_low:GAUGE:600:0:100', 'DS:time_remaining:GAUGE:600:0:U', 'DS:battery_voltage:GAUGE:600:0:U', 'DS:input_voltage:GAUGE:600:0:U', @@ -42,11 +47,10 @@ $rrd_def = array( $fields = array( 'charge' => $charge, - 'battery_low' => $bat_low, - 'time_remaining' => $remaining, + 'time_remaining' => $remaining/60, 'battery_voltage' => $bat_volt, - 'input_voltage' => $input_vol, - 'nominal_voltage' => $line_vol, + 'input_voltage' => $line_volt, + 'nominal_voltage' => $input_volt, 'load' => $load, ); From 7d7621fd3e03b86eddc4777e31c611ef46dd299d Mon Sep 17 00:00:00 2001 From: crcro Date: Thu, 15 Sep 2016 23:24:25 +0300 Subject: [PATCH 010/126] removed file versions from comments --- html/includes/graphs/application/ups-nut_remaining.inc.php | 3 --- .../graphs/application/ups-nut_voltage_battery.inc.php | 3 --- html/pages/device/apps/ups-nut.inc.php | 1 + includes/polling/applications/ups-nut.inc.php | 4 ---- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/html/includes/graphs/application/ups-nut_remaining.inc.php b/html/includes/graphs/application/ups-nut_remaining.inc.php index bbd5ca04ad..c566388c21 100644 --- a/html/includes/graphs/application/ups-nut_remaining.inc.php +++ b/html/includes/graphs/application/ups-nut_remaining.inc.php @@ -13,14 +13,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * -* @version 1.1 * @package LibreNMS * @link http://librenms.org * @copyright 2016 crcro * @author Cercel Valentin * -* v1 - initial release -* v1.1 - changed description from seconds to minutes */ require 'includes/graphs/common.inc.php'; diff --git a/html/includes/graphs/application/ups-nut_voltage_battery.inc.php b/html/includes/graphs/application/ups-nut_voltage_battery.inc.php index 5221dcb9b4..659e79d763 100644 --- a/html/includes/graphs/application/ups-nut_voltage_battery.inc.php +++ b/html/includes/graphs/application/ups-nut_voltage_battery.inc.php @@ -13,14 +13,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * -* @version 1.1 * @package LibreNMS * @link http://librenms.org * @copyright 2016 crcro * @author Cercel Valentin * -* v1 - initial release -* v1.1 - removed the battery_low graph */ require 'includes/graphs/common.inc.php'; diff --git a/html/pages/device/apps/ups-nut.inc.php b/html/pages/device/apps/ups-nut.inc.php index ab0eaf8549..78e1d23917 100644 --- a/html/pages/device/apps/ups-nut.inc.php +++ b/html/pages/device/apps/ups-nut.inc.php @@ -17,6 +17,7 @@ * @link http://librenms.org * @copyright 2016 crcro * @author Cercel Valentin +* */ global $config; diff --git a/includes/polling/applications/ups-nut.inc.php b/includes/polling/applications/ups-nut.inc.php index 0b9400cff0..142c91a6f7 100644 --- a/includes/polling/applications/ups-nut.inc.php +++ b/includes/polling/applications/ups-nut.inc.php @@ -19,10 +19,6 @@ * @copyright 2016 crcro * @author Cercel Valentin * -* v1 - initial release -* v1.1 - removed battery_low value -* - corrected line nominal and input values -* - convert seconds to minutes on remaining uptime */ //NET-SNMP-EXTEND-MIB::nsExtendOutputFull."ups-nut" From 79b93ddd33ff33584f63121abf76f4f40d449475 Mon Sep 17 00:00:00 2001 From: crcro Date: Sat, 17 Sep 2016 23:42:08 +0300 Subject: [PATCH 011/126] fix conflict --- sql-schema/{134.sql => 135.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql-schema/{134.sql => 135.sql} (100%) diff --git a/sql-schema/134.sql b/sql-schema/135.sql similarity index 100% rename from sql-schema/134.sql rename to sql-schema/135.sql From 780d8b2139d6b9485ed7688eb0e074e869b491a7 Mon Sep 17 00:00:00 2001 From: crcro Date: Tue, 20 Sep 2016 22:01:29 +0300 Subject: [PATCH 012/126] removed snmp query from webui, changed and added echo if file is missing --- .../graphs/application/ups-nut_charge.inc.php | 3 +++ .../graphs/application/ups-nut_load.inc.php | 3 +++ .../graphs/application/ups-nut_remaining.inc.php | 3 +++ .../application/ups-nut_voltage_battery.inc.php | 2 +- html/pages/device/apps/ups-nut.inc.php | 15 +++++---------- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/html/includes/graphs/application/ups-nut_charge.inc.php b/html/includes/graphs/application/ups-nut_charge.inc.php index 130ebdd62e..040d4c861b 100644 --- a/html/includes/graphs/application/ups-nut_charge.inc.php +++ b/html/includes/graphs/application/ups-nut_charge.inc.php @@ -31,5 +31,8 @@ $unit_text = 'Percent'; $ups_nut = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id'])); if (rrdtool_check_rrd_exists($ups_nut)) { $rrd_filename = $ups_nut; +} else { + echo "file missing: $rrd_filename"; } + require 'includes/graphs/generic_simplex.inc.php'; diff --git a/html/includes/graphs/application/ups-nut_load.inc.php b/html/includes/graphs/application/ups-nut_load.inc.php index c678aa5ff8..2530f23d08 100644 --- a/html/includes/graphs/application/ups-nut_load.inc.php +++ b/html/includes/graphs/application/ups-nut_load.inc.php @@ -31,5 +31,8 @@ $unit_text = 'Percent'; $ups_nut = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id'])); if (rrdtool_check_rrd_exists($ups_nut)) { $rrd_filename = $ups_nut; +} else { + echo "file missing: $rrd_filename"; } + require 'includes/graphs/generic_simplex.inc.php'; diff --git a/html/includes/graphs/application/ups-nut_remaining.inc.php b/html/includes/graphs/application/ups-nut_remaining.inc.php index c566388c21..16c3b3289d 100644 --- a/html/includes/graphs/application/ups-nut_remaining.inc.php +++ b/html/includes/graphs/application/ups-nut_remaining.inc.php @@ -32,5 +32,8 @@ $unit_text = 'Minutes'; $ups_nut = rrd_name($device['hostname'], array('app', 'ups-nut', $app['app_id'])); if (rrdtool_check_rrd_exists($ups_nut)) { $rrd_filename = $ups_nut; +} else { + echo "file missing: $rrd_filename"; } + require 'includes/graphs/generic_simplex.inc.php'; diff --git a/html/includes/graphs/application/ups-nut_voltage_battery.inc.php b/html/includes/graphs/application/ups-nut_voltage_battery.inc.php index 659e79d763..a00946c450 100644 --- a/html/includes/graphs/application/ups-nut_voltage_battery.inc.php +++ b/html/includes/graphs/application/ups-nut_voltage_battery.inc.php @@ -48,7 +48,7 @@ if (rrdtool_check_rrd_exists($rrd_filename)) { $i++; } } else { - echo "file missing: ".$rrd_filename; + echo "file missing: $rrd_filename"; } require 'includes/graphs/generic_v3_multiline_float.inc.php'; diff --git a/html/pages/device/apps/ups-nut.inc.php b/html/pages/device/apps/ups-nut.inc.php index 78e1d23917..13285ae384 100644 --- a/html/pages/device/apps/ups-nut.inc.php +++ b/html/pages/device/apps/ups-nut.inc.php @@ -22,17 +22,12 @@ global $config; -//NET-SNMP-EXTEND-MIB::nsExtendOutLine.\"ups-nut\" -$ups_model = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.7.117.112.115.45.110.117.116.4', '-Oqv'); -$ups_serial = snmp_get($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.7.117.112.115.45.110.117.116.5', '-Oqv'); -$ups_details = $ups_model.' (SN:'.$ups_serial.')'; - $graphs = array( - 'ups-nut_remaining' => 'Remaining time: '.$ups_details, - 'ups-nut_load' => 'Load: '.$ups_details, - 'ups-nut_voltage_battery' => 'Battery voltage: '.$ups_details, - 'ups-nut_charge' => 'Charge: '.$ups_details, - 'ups-nut_voltage_input' => 'Input voltage: '.$ups_details, + 'ups-nut_remaining' => 'Remaining time: ', + 'ups-nut_load' => 'Load: ', + 'ups-nut_voltage_battery' => 'Battery voltage: ', + 'ups-nut_charge' => 'Charge: ', + 'ups-nut_voltage_input' => 'Input voltage: ', ); foreach ($graphs as $key => $text) { From 0eea1801514b33a50e3686310ea449c2524bab3d Mon Sep 17 00:00:00 2001 From: crcro Date: Tue, 20 Sep 2016 22:03:30 +0300 Subject: [PATCH 013/126] removed file version and unused vars --- includes/polling/applications/ups-nut.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/polling/applications/ups-nut.inc.php b/includes/polling/applications/ups-nut.inc.php index 142c91a6f7..721d0923fe 100644 --- a/includes/polling/applications/ups-nut.inc.php +++ b/includes/polling/applications/ups-nut.inc.php @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * -* @version 1.1 * @package LibreNMS * @link http://librenms.org * @copyright 2016 crcro @@ -29,7 +28,7 @@ $ups_nut = snmp_get($device, $oid, '-Oqv'); echo ' '.$name; -list ($charge, $remaining, $bat_volt, $model, $serial, $input_volt, $line_volt, $load) = explode("\n", $ups_nut); +list ($charge, $remaining, $bat_volt, $input_volt, $line_volt, $load) = explode("\n", $ups_nut); $rrd_name = array('app', $name, $app_id); $rrd_def = array( From 389ab71c215b8e74042d0058e08d0c31aed28bf4 Mon Sep 17 00:00:00 2001 From: FTBZ Date: Wed, 21 Sep 2016 11:53:31 +0200 Subject: [PATCH 014/126] Enhancement and correction to the VPN session graph --- .../graphs/device/cras_sessions.inc.php | 59 +++++++++++-------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/html/includes/graphs/device/cras_sessions.inc.php b/html/includes/graphs/device/cras_sessions.inc.php index a5bc233a33..c50b769734 100644 --- a/html/includes/graphs/device/cras_sessions.inc.php +++ b/html/includes/graphs/device/cras_sessions.inc.php @@ -13,34 +13,43 @@ $rrd_options .= " DEF:lb=$rrd_filename:lb:AVERAGE"; $rrd_options .= " DEF:svc=$rrd_filename:svc:AVERAGE"; $rrd_options .= " DEF:webvpn=$rrd_filename:webvpn:AVERAGE"; -$rrd_options .= " COMMENT:'Sessions Current Average Maximum\\n'"; +$rrd_options .= " COMMENT:'Sessions Current Average Maximum\\n'"; -$rrd_options .= " AREA:svc#aa0000:'SSLVPN Tunnels'"; -$rrd_options .= " GPRINT:svc:LAST:'%6.2lf%s'"; -$rrd_options .= " GPRINT:svc:AVERAGE:' %6.2lf%s'"; -$rrd_options .= " GPRINT:svc:MAX:' %6.2lf%s\\\\n'"; +$rrd_options .= " AREA:svc#1985A1:'AnyConnect ':STACK"; +$rrd_options .= " GPRINT:svc:LAST:'%8.2lf'"; +$rrd_options .= " GPRINT:svc:AVERAGE:' %8.2lf'"; +$rrd_options .= " GPRINT:svc:MAX:' %8.2lf\\\\n'"; -$rrd_options .= " AREA:webvpn#999999:'Clientless VPN'"; -$rrd_options .= " GPRINT:webvpn:LAST:'%6.2lf%s'"; -$rrd_options .= " GPRINT:webvpn:AVERAGE:' %6.2lf%s'"; -$rrd_options .= " GPRINT:webvpn:MAX:' %6.2lf%s\\\\n'"; +$rrd_options .= " AREA:webvpn#4C5C68:'Clientless VPN':STACK"; +$rrd_options .= " GPRINT:webvpn:LAST:'%8.2lf'"; +$rrd_options .= " GPRINT:webvpn:AVERAGE:' %8.2lf'"; +$rrd_options .= " GPRINT:webvpn:MAX:' %8.2lf\\\\n'"; -$rrd_options .= " AREA:ipsec#00aa00:'IPSEC '"; -$rrd_options .= " GPRINT:ipsec:LAST:'%6.2lf%s'"; -$rrd_options .= " GPRINT:ipsec:AVERAGE:' %6.2lf%s'"; -$rrd_options .= " GPRINT:ipsec:MAX:' %6.2lf%s\\\\n'"; +$rrd_options .= " AREA:ipsec#46494C:'IPSEC ':STACK"; +$rrd_options .= " GPRINT:ipsec:LAST:'%8.2lf'"; +$rrd_options .= " GPRINT:ipsec:AVERAGE:' %8.2lf'"; +$rrd_options .= " GPRINT:ipsec:MAX:' %8.2lf\\\\n'"; -$rrd_options .= " AREA:l2l#aaaa00:'Lan-to-Lan '"; -$rrd_options .= ' GPRINT:l2l:LAST:%6.2lf%s'; -$rrd_options .= " GPRINT:l2l:AVERAGE:' %6.2lf%s'"; -$rrd_options .= " GPRINT:l2l:MAX:' %6.2lf%s\\\\n'"; +$rrd_options .= " AREA:l2l#C5C3C6:'LAN-to-LAN ':STACK"; +$rrd_options .= ' GPRINT:l2l:LAST:%8.2lf'; +$rrd_options .= " GPRINT:l2l:AVERAGE:' %8.2lf'"; +$rrd_options .= " GPRINT:l2l:MAX:' %8.2lf\\\\n'"; -$rrd_options .= " AREA:email#0000aa:'Email '"; -$rrd_options .= ' GPRINT:email:LAST:%6.2lf%s'; -$rrd_options .= " GPRINT:email:AVERAGE:' %6.2lf%s'"; -$rrd_options .= " GPRINT:email:MAX:' %6.2lf%s\\\\n'"; +$rrd_options .= " AREA:email#DCDCDD:'Email ':STACK"; +$rrd_options .= ' GPRINT:email:LAST:%8.2lf'; +$rrd_options .= " GPRINT:email:AVERAGE:' %8.2lf'"; +$rrd_options .= " GPRINT:email:MAX:' %8.2lf\\\\n'"; -$rrd_options .= " AREA:lb#aa00aa:'Load Balancer '"; -$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'"; +$rrd_options .= " AREA:lb#FFFFFF:'Load Balancer ':STACK"; +$rrd_options .= ' GPRINT:lb:LAST:%8.2lf'; +$rrd_options .= " GPRINT:lb:AVERAGE:' %8.2lf'"; +$rrd_options .= " GPRINT:lb:MAX:' %8.2lf\\\\n'"; + +// Total +$rrd_options .= " 'CDEF:TOTAL=email,ipsec,l2l,lb,svc,webvpn,+,+,+,+,+'"; + +$rrd_options .= " 'LINE1:TOTAL#000000FF:Total '"; + +$rrd_options .= " 'GPRINT:TOTAL:LAST:%8.2lf'"; +$rrd_options .= " 'GPRINT:TOTAL:AVERAGE: %8.2lf'"; +$rrd_options .= " 'GPRINT:TOTAL:MAX: %8.2lf\\\\n'"; From 37e577907076733c71214ed9c033f5205c903482 Mon Sep 17 00:00:00 2001 From: FTBZ Date: Wed, 21 Sep 2016 15:18:39 +0200 Subject: [PATCH 015/126] New documentation with SNMP configuration examples --- doc/Support/SNMP-Configuration-Examples.md | 150 +++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 doc/Support/SNMP-Configuration-Examples.md diff --git a/doc/Support/SNMP-Configuration-Examples.md b/doc/Support/SNMP-Configuration-Examples.md new file mode 100644 index 0000000000..328c6ec582 --- /dev/null +++ b/doc/Support/SNMP-Configuration-Examples.md @@ -0,0 +1,150 @@ +source: Support/SNMP-Configuration-Examples.md + +# SNMP configuration examples + +Table of Content: +- [Devices](#devices) + - [Cisco](#cisco) + - [Adaptive Security Appliance (ASA)](#adaptive-security-appliance-asa) + - [IOS](#ios) + - [IOS](#ios) + - [IOS XE](#ios-xe) + - [NX-OS](#nx-os) + - [Wireless LAN Controller (WLC)](#wireless-lan-controller-wlc) + - [Infoblox](#infoblox) + - [NIOS 7.x](#nios-7x) + - [Juniper](#juniper) + - [Junos OS](#junos-os) + - [Palo Alto](#palo-alto) + - [PANOS 6.x/7.x](#panos-6x7x) +- [Operating systems](#operating-systems) + - [Linux (snmpd)](#linux-snmpd) + - [Windows Server 2012 R2](#windows-server-2012-r2) + +## Devices + +### Cisco +#### Adaptive Security Appliance (ASA) +1. Launch ASDM and connect to your device +2. Go to Configuration > Management Access > SNMP +3. Add your community string +4. Add in the "SNMP Host Access List" section your LibreNMS server IP address +5. Click Apply and Save + +#### IOS + +``` +snmp-server community YOUR-COMMUNITY RO +snmp-server contact YOUR-CONTACT +snmp-server location YOUR-LOCATION +``` + +#### IOS XE +``` +snmp-server community YOUR-COMMUNITY RO +snmp-server contact YOUR-CONTACT +snmp-server location YOUR-LOCATION +``` + +#### NX-OS +``` +snmp-server community YOUR-COMMUNITY RO +snmp-server contact YOUR-CONTACT +snmp-server location YOUR-LOCATION +``` + +#### Wireless LAN Controller (WLC) +1. Access the web admin page and log in +2. If you are running version 8.1 and later, on the new dashboard click "Advanced" +3. Go to management Tab +4. On SNMP sub-menu, select "Communities" +5. Click "New..." +6. Add your community name and leave IP addresses empty +7. Click Apply and Save + +### Infoblox +#### NIOS 7.x +1. Access the web admin page and log in +2. Go to Grid tab > Grid Manager +3. In the right menu select "Grid properties" +4. Select "SNMP" menu +5. Click "Enable SNMPv1/SNMPv2 Queries" +6. Add your community +7. Click Save & Close + +### Juniper +#### Junos OS +``` +set snmp description description +set snmp location location +set snmp contact contact +set snmp community YOUR-COMMUNITY authorization read-only +``` + +### Palo Alto +#### PANOS 6.x/7.x +1. Access the web admin page and log in +2. Go to Device tab > Setup +3. Go to the sub-tab "Operations" +4. Click "SNMP Setup" +5. Enter your SNMP community and then click "OK" +6. Click Apply + +Note that you need to allow SNMP on the needed interfaces. To do that you need to create a network "Interface Mgmt" profile for standard interface and allow SNMP under "Device > Management > Management Interface Settings" for out of band management interface. + + +## Operating systems +### Linux (snmpd) + +Replace your snmpd.conf file by the example below and edit it with appropriate community in "RANDOMSTRINGGOESHERE". + +``` +vi /etc/snmp/snmpd.conf +``` + +``` +# Change RANDOMSTRINGGOESHERE to your preferred SNMP community string +com2sec readonly default RANDOMSTRINGGOESHERE + +group MyROGroup v2c readonly +view all included .1 80 +access MyROGroup "" any noauth exact all none none + +syslocation Rack, Room, Building, City, Country [GPSX,Y] +syscontact Your Name + +#Distro Detection +extend .1.3.6.1.4.1.2021.7890.1 distro /usr/bin/distro +``` +The LibreNMS server include a copy of this example here: + +``` +/opt/librenms/snmpd.conf.example +``` + +#### Restart the snmpd service: + +##### CentOS 6 / Red hat 6 +``` +service snmpd restart +``` +##### CentOS 7 / Red hat 7 +``` +systemctl restart snmpd +``` +##### Ubuntu +``` +service snmpd restart +``` +### Windows Server 2012 R2 +1. Log in to your Windows Server 2012 R2 +2. Start "Server Manager" under "Administrative Tools" +3. Click "Manage" and then "Add Roles and Features" +4. Continue by pressing "Next" to the "Features" menu +5. Install (if not installed) "SNMP Service" +6. Start "Services" under "Administrative Tools" +7. Edit "SNMP Service" properties +8. Go to the security tab +9. In "Accepted community name" click "Add" to add your community string and permission +10. In "Accept SNMP packets from these hosts" click "Add" and add your LibreNMS server IP address +11. Validate change by clicking "Apply" From abe25614dd19848913665afa6ad4d459415787f9 Mon Sep 17 00:00:00 2001 From: FTBZ Date: Wed, 21 Sep 2016 21:00:56 +0200 Subject: [PATCH 016/126] New documentation with SNMP configuration examples --- doc/Support/SNMP-Configuration-Examples.md | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/doc/Support/SNMP-Configuration-Examples.md b/doc/Support/SNMP-Configuration-Examples.md index 328c6ec582..351116d840 100644 --- a/doc/Support/SNMP-Configuration-Examples.md +++ b/doc/Support/SNMP-Configuration-Examples.md @@ -6,10 +6,7 @@ Table of Content: - [Devices](#devices) - [Cisco](#cisco) - [Adaptive Security Appliance (ASA)](#adaptive-security-appliance-asa) - - [IOS](#ios) - - [IOS](#ios) - - [IOS XE](#ios-xe) - - [NX-OS](#nx-os) + - [IOS / IOS XE / NX-OS](#ios--ios-xe--nx-os) - [Wireless LAN Controller (WLC)](#wireless-lan-controller-wlc) - [Infoblox](#infoblox) - [NIOS 7.x](#nios-7x) @@ -19,6 +16,7 @@ Table of Content: - [PANOS 6.x/7.x](#panos-6x7x) - [Operating systems](#operating-systems) - [Linux (snmpd)](#linux-snmpd) + - [Windows Server 2008 R2](#windows-server-2008-r2) - [Windows Server 2012 R2](#windows-server-2012-r2) ## Devices @@ -31,7 +29,7 @@ Table of Content: 4. Add in the "SNMP Host Access List" section your LibreNMS server IP address 5. Click Apply and Save -#### IOS +#### IOS / IOS XE / NX-OS ``` snmp-server community YOUR-COMMUNITY RO @@ -39,20 +37,6 @@ snmp-server contact YOUR-CONTACT snmp-server location YOUR-LOCATION ``` -#### IOS XE -``` -snmp-server community YOUR-COMMUNITY RO -snmp-server contact YOUR-CONTACT -snmp-server location YOUR-LOCATION -``` - -#### NX-OS -``` -snmp-server community YOUR-COMMUNITY RO -snmp-server contact YOUR-CONTACT -snmp-server location YOUR-LOCATION -``` - #### Wireless LAN Controller (WLC) 1. Access the web admin page and log in 2. If you are running version 8.1 and later, on the new dashboard click "Advanced" @@ -136,6 +120,19 @@ systemctl restart snmpd ``` service snmpd restart ``` + +### Windows Server 2008 R2 +1. Log in to your Windows Server 2008 R2 +2. Start "Server Manager" under "Administrative Tools" +3. Click "Features" and then click "Add Feature" +5. Check (if not checked) "SNMP Service", click "Next" until "Install" +6. Start "Services" under "Administrative Tools" +7. Edit "SNMP Service" properties +8. Go to the security tab +9. In "Accepted community name" click "Add" to add your community string and permission +10. In "Accept SNMP packets from these hosts" click "Add" and add your LibreNMS server IP address +11. Validate change by clicking "Apply" + ### Windows Server 2012 R2 1. Log in to your Windows Server 2012 R2 2. Start "Server Manager" under "Administrative Tools" From 63f42acda6e8b02b7cd880e3f4d0672c083b8da5 Mon Sep 17 00:00:00 2001 From: crcro Date: Thu, 22 Sep 2016 00:11:16 +0300 Subject: [PATCH 017/126] general updates --- html/css/styles.css | 4 ++ html/includes/common/availability-map.inc.php | 50 +++++++++++++------ html/pages/settings/webui.inc.php | 4 ++ sql-schema/135.sql | 7 --- sql-schema/136.sql | 4 ++ 5 files changed, 46 insertions(+), 23 deletions(-) delete mode 100644 sql-schema/135.sql create mode 100644 sql-schema/136.sql diff --git a/html/css/styles.css b/html/css/styles.css index 7e3fe078e1..a309e9ab10 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1990,3 +1990,7 @@ label { float:left; background-color: #D9534F; } + +.availability-map-widget-header { + line-height:30px; +} diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php index 7a3bf215bd..f3c9ae5b69 100644 --- a/html/includes/common/availability-map.inc.php +++ b/html/includes/common/availability-map.inc.php @@ -12,24 +12,51 @@ * the source code distribution for details. */ +$sql = dbFetchRow('SELECT `settings` FROM `users_widgets` WHERE `user_id` = ? AND `widget_id` = ?', array($_SESSION["user_id"], '1')); +$widget_mode = json_decode($sql['settings']); + +if (isset($_SESSION["map_view"]) && is_numeric($_SESSION["map_view"])) { + $mode = $_SESSION["map_view"]; +} else { + $mode = $widget_mode->{'mode'}; +} + $select_modes = array( '0' => 'only devices', '1' => 'only services', '2' => 'devices and services', ); +if ($config['webui']['availability_map_compact'] == 1) { + $compact_tile = $widget_mode->{'tile_width'}; +} + if (defined('SHOW_SETTINGS')) { $common_output[] = '
      - +
      -
      + '; + + if ($config['webui']['availability_map_compact'] == 1) { + $common_output[] = '
      +
      + +
      +
      + +
      +
      '; + } + + $common_output[] = ' +
      @@ -37,16 +64,6 @@ if (defined('SHOW_SETTINGS')) { '; } else { require_once 'includes/object-cache.inc.php'; - - $sql = dbFetchRow('SELECT `settings` FROM `users_widgets` WHERE `user_id` = ? AND `widget_id` = ?', array($_SESSION["user_id"], '1')); - $widget_mode = json_decode($sql['settings']); - - if (isset($_SESSION["map_view"])) { - $mode = $_SESSION["map_view"]; - } else { - $mode = $widget_mode->{'mode'}; - } - $host_up_count = 0; $host_warn_count = 0; $host_down_count = 0; @@ -114,7 +131,7 @@ if (defined('SHOW_SETTINGS')) { $host_down_count++; } - if ($config['webui']['availability_map_old'] == 0) { + if ($config['webui']['availability_map_compact'] == 0) { if ($directpage == "yes") { $deviceIcon = getImage($device); $temp_output[] = ' @@ -132,7 +149,7 @@ if (defined('SHOW_SETTINGS')) { '; } } else { - $temp_output[] = '
      '; + $temp_output[] = '
      '; } } } @@ -159,7 +176,7 @@ if (defined('SHOW_SETTINGS')) { $service_down_count++; } - if ($config['webui']['availability_map_old'] == 0) { + if ($config['webui']['availability_map_compact'] == 0) { if ($directpage == "yes") { $deviceIcon = getImage($service); $temp_output[] = ' @@ -176,9 +193,10 @@ if (defined('SHOW_SETTINGS')) { ' . $service['service_type'] . ' - ' . $serviceState . ' '; + } } else { - $temp_output[] = '
      '; + $temp_output[] = '
      '; } } } else { diff --git a/html/pages/settings/webui.inc.php b/html/pages/settings/webui.inc.php index e5b39cf1bb..b1ff79a24c 100644 --- a/html/pages/settings/webui.inc.php +++ b/html/pages/settings/webui.inc.php @@ -31,6 +31,10 @@ $availability_map_conf = array( 'descr' => 'Use device groups filter', 'type' => 'checkbox', ), + array('name' => 'webui.availability_map_box_size', + 'descr' => 'Availability box width', + 'type' => 'numeric', + ), ); $dashboard_conf = array( diff --git a/sql-schema/135.sql b/sql-schema/135.sql deleted file mode 100644 index cecdf2a1dd..0000000000 --- a/sql-schema/135.sql +++ /dev/null @@ -1,7 +0,0 @@ -INSERT INTO `config` (`config_name`, `config_value`, `config_default`, `config_descr`, `config_group`, `config_group_order`, `config_sub_group`, `config_sub_group_order`, `config_hidden`, `config_disabled`) VALUES('webui.availability_map_direct_tile_size', '200', '165', 'Input desired tile width in pixels for direct page mode', 'webui', 0, 'graph', 0, '0', '0'); -INSERT INTO `config` (`config_name`, `config_value`, `config_default`, `config_descr`, `config_group`, `config_group_order`, `config_sub_group`, `config_sub_group_order`, `config_hidden`, `config_disabled`) VALUES('webui.availability_map_old_widget_tile_size', '60', '10', 'Input desired tile width in pixels for widget mode', 'webui', 0, 'graph', 0, '0', '0'); -UPDATE `config` SET `config_name` = 'webui.availability_map_old', `config_hidden` = '0' WHERE `config_name` = 'webui.old_availability_map'; -UPDATE `config` SET `config_hidden` = '0' WHERE `config_name` = 'webui.availability_map_sort_status'; -UPDATE `config` SET `config_descr` = 'Enable usage of device groups filter' WHERE `config_name` = 'webui.availability_map_use_device_groups'; -UPDATE `config` SET `config_descr` = 'Sort devices and services by status' WHERE `config_name` = 'webui.availability_map_sort_status'; -UPDATE `config` SET `config_name` = 'webui.availability_map_compact' WHERE `config_name` = 'webui.availability_map_old'; diff --git a/sql-schema/136.sql b/sql-schema/136.sql new file mode 100644 index 0000000000..f5a311d2ab --- /dev/null +++ b/sql-schema/136.sql @@ -0,0 +1,4 @@ +INSERT INTO `config` (`config_name`, `config_value`, `config_default`, `config_descr`, `config_group`, `config_group_order`, `config_sub_group`, `config_sub_group_order`, `config_hidden`, `config_disabled`) VALUES('webui.availability_map_box_size', '165', '165', 'Input desired tile width in pixels for box size in full view', 'webui', 0, 'graph', 0, '0', '0'); +UPDATE `config` SET `config_hidden` = '0', `config_descr` = 'Sort devices and services by status' WHERE `config_name` = 'webui.availability_map_sort_status'; +UPDATE `config` SET `config_descr` = 'Enable usage of device groups filter' WHERE `config_name` = 'webui.availability_map_use_device_groups'; +UPDATE `config` SET `config_name` = 'webui.availability_map_compact', `config_hidden` = '0' WHERE `config_name` = 'webui.old_availability_map'; From f6691ab0a67afe5f8042f5c3b180558a11a87692 Mon Sep 17 00:00:00 2001 From: crcro Date: Thu, 22 Sep 2016 00:12:20 +0300 Subject: [PATCH 018/126] fix renumbering --- sql-schema/{136.sql => 137.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql-schema/{136.sql => 137.sql} (100%) diff --git a/sql-schema/136.sql b/sql-schema/137.sql similarity index 100% rename from sql-schema/136.sql rename to sql-schema/137.sql From edbbc7fddd4a6146b487f1b6dd7794f0978f175c Mon Sep 17 00:00:00 2001 From: Neil Lathwood Date: Wed, 21 Sep 2016 22:17:51 +0100 Subject: [PATCH 019/126] fix: Fixed swos discovery --- includes/discovery/os/swos.inc.php | 2 +- tests/OSDiscoveryTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/discovery/os/swos.inc.php b/includes/discovery/os/swos.inc.php index 00f8d162d4..4096020e83 100644 --- a/includes/discovery/os/swos.inc.php +++ b/includes/discovery/os/swos.inc.php @@ -1,7 +1,7 @@ 'MicroTik' + 'SNMPv2-MIB::sysName.0' => 'MikroTik' ); $this->checkOS('swos', 'RB250GS', '', $mockSnmp); $this->checkOS('swos', 'RB260GS', '', $mockSnmp); From cae9f577061bc84736fe2eebf3f5f15228bd9446 Mon Sep 17 00:00:00 2001 From: crcro Date: Thu, 22 Sep 2016 00:27:12 +0300 Subject: [PATCH 020/126] fix blank line --- html/includes/common/availability-map.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php index f3c9ae5b69..86317ba481 100644 --- a/html/includes/common/availability-map.inc.php +++ b/html/includes/common/availability-map.inc.php @@ -193,7 +193,6 @@ if (defined('SHOW_SETTINGS')) { ' . $service['service_type'] . ' - ' . $serviceState . ' '; - } } else { $temp_output[] = '
      '; From 7371c6e1b81ce95548486f19e67b18ee33f0f28a Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Wed, 21 Sep 2016 17:15:28 -0500 Subject: [PATCH 021/126] feature: improved readability for snmp debug output It now matches RRD and SQL output format, the color is cyan Slightly better ip removal from debug output, only removes valid IPs now. --- includes/common.php | 27 ++++++++++++++++----------- includes/dbFacile.mysql.php | 2 +- includes/dbFacile.mysqli.php | 2 +- includes/snmp.inc.php | 4 ---- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/includes/common.php b/includes/common.php index abf242305e..cd7669c3e5 100644 --- a/includes/common.php +++ b/includes/common.php @@ -70,21 +70,26 @@ function format_number_short($number, $sf) function external_exec($command) { global $debug,$vdebug; - if ($debug && !$vdebug) { - $debug_command = preg_replace('/-c [\S]+/', '-c COMMUNITY', $command); - $debug_command = preg_replace('/(udp|udp6|tcp|tcp6):(.*):([\d]+)/', '\1:HOSTNAME:\3', $debug_command); - d_echo($debug_command); - } elseif ($vdebug) { - d_echo($command."\n"); + if ($debug) { + if ($vdebug) { + c_echo('SNMP[%c'.$command."%n]\n"); + } else { + $debug_command = preg_replace('/-c [\S]+/', '-c COMMUNITY', $command); + $debug_command = preg_replace('/(udp|udp6|tcp|tcp6):([^:]+):([\d]+)/', '\1:HOSTNAME:\3', $debug_command); + c_echo('SNMP[%c'.$debug_command."%n]\n"); + } } $output = shell_exec($command); - if ($debug && !$vdebug) { - $debug_output = preg_replace('/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/', '*', $output); - d_echo("$debug_output\n"); - } elseif ($vdebug) { - d_echo($output."\n"); + if ($debug) { + if ($vdebug) { + d_echo($output.PHP_EOL); + } else { + $ip_regex = '/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/'; + $debug_output = preg_replace($ip_regex, '*', $output); + d_echo($debug_output.PHP_EOL); + } } return $output; diff --git a/includes/dbFacile.mysql.php b/includes/dbFacile.mysql.php index 1d7fa5a2dc..0c8af689bb 100644 --- a/includes/dbFacile.mysql.php +++ b/includes/dbFacile.mysql.php @@ -32,7 +32,7 @@ function dbQuery($sql, $parameters = array()) if (preg_match('/(INSERT INTO `alert_log`).*(details)/i', $fullSql)) { echo "\nINSERT INTO `alert_log` entry masked due to binary data\n"; } else { - c_echo("\nSQL[%y".$fullSql.'%n] '); + c_echo('SQL[%y'.$fullSql."%n] \n"); } } else { $sql_debug[] = $fullSql; diff --git a/includes/dbFacile.mysqli.php b/includes/dbFacile.mysqli.php index f58ef69349..96ed1c2480 100644 --- a/includes/dbFacile.mysqli.php +++ b/includes/dbFacile.mysqli.php @@ -32,7 +32,7 @@ function dbQuery($sql, $parameters = array()) if (preg_match('/(INSERT INTO `alert_log`).*(details)/i', $fullSql)) { echo "\nINSERT INTO `alert_log` entry masked due to binary data\n"; } else { - c_echo("\nSQL[%y".$fullSql.'%n] '); + c_echo('SQL[%y'.$fullSql."%n] \n"); } } else { $sql_debug[] = $fullSql; diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php index e7189f2b58..63d878d085 100644 --- a/includes/snmp.inc.php +++ b/includes/snmp.inc.php @@ -554,10 +554,6 @@ function snmp_gen_auth(&$device) } }//end if - if ($vdebug) { - print "DEBUG: SNMP Auth options = $cmd\n"; - } - return $cmd; }//end snmp_gen_auth() From 8b09077acee786e03dce0fc62a174729804cb5d9 Mon Sep 17 00:00:00 2001 From: crcro Date: Thu, 22 Sep 2016 02:10:50 +0300 Subject: [PATCH 022/126] refactor os discovery from w to z --- includes/discovery/os/waas.inc.php | 8 +++----- includes/discovery/os/watchguard.inc.php | 6 ++---- includes/discovery/os/webpower.inc.php | 7 +++---- includes/discovery/os/windows.inc.php | 10 ++-------- includes/discovery/os/wxgoos.inc.php | 12 ++---------- includes/discovery/os/xerox.inc.php | 12 ++---------- includes/discovery/os/xirrus.inc.php | 8 ++------ includes/discovery/os/zxr10.inc.php | 9 ++------- includes/discovery/os/zynos.inc.php | 7 +++---- includes/discovery/os/zywall.inc.php | 9 ++------- includes/discovery/os/zyxelnwa.inc.php | 6 ++---- 11 files changed, 25 insertions(+), 69 deletions(-) diff --git a/includes/discovery/os/waas.inc.php b/includes/discovery/os/waas.inc.php index aacfb66527..b0ec7876a4 100644 --- a/includes/discovery/os/waas.inc.php +++ b/includes/discovery/os/waas.inc.php @@ -9,9 +9,7 @@ * option) any later version. Please see LICENSE.txt at the top level of * the source code distribution for details. */ - -if (!$os) { - if (preg_match('/^Cisco\ Wide\ Area\ Application\ Services/', $sysDescr)) { - $os = 'waas'; - } + +if (starts_with('Cisco Wide Area Application Services', $sysDescr)) { + $os = 'waas'; } diff --git a/includes/discovery/os/watchguard.inc.php b/includes/discovery/os/watchguard.inc.php index f3f8727966..9928c22bc0 100644 --- a/includes/discovery/os/watchguard.inc.php +++ b/includes/discovery/os/watchguard.inc.php @@ -1,7 +1,5 @@ Date: Thu, 22 Sep 2016 02:34:17 +0300 Subject: [PATCH 023/126] refactor os discovery s to w --- includes/discovery/os/saf.inc.php | 6 ++--- includes/discovery/os/samsungprinter.inc.php | 10 +++---- includes/discovery/os/sanos.inc.php | 6 ++--- includes/discovery/os/screenos.inc.php | 10 ++----- includes/discovery/os/sentry3.inc.php | 24 ++++++++--------- includes/discovery/os/serveriron.inc.php | 26 +++++++++--------- includes/discovery/os/sharp.inc.php | 7 +++-- includes/discovery/os/smartax.inc.php | 6 ++--- includes/discovery/os/solaris.inc.php | 27 +++++++++---------- includes/discovery/os/sonicwall.inc.php | 6 ++--- includes/discovery/os/sonus-gsx.inc.php | 6 ++--- includes/discovery/os/sonus-sbc.inc.php | 6 ++--- includes/discovery/os/speedtouch.inc.php | 10 ++----- includes/discovery/os/sub10.inc.php | 6 ++--- .../discovery/os/supermicro-switch.inc.php | 12 ++------- includes/discovery/os/symbol.inc.php | 6 ++--- includes/discovery/os/tpconductor.inc.php | 6 ++--- includes/discovery/os/tplink.inc.php | 6 ++--- includes/discovery/os/tranzeo.inc.php | 6 ++--- includes/discovery/os/vccodec.inc.php | 6 ++--- includes/discovery/os/vcs.inc.php | 6 ++--- includes/discovery/os/viprinux.inc.php | 6 ++--- includes/discovery/os/vmware.inc.php | 9 ++----- includes/discovery/os/vrp.inc.php | 6 ++--- 24 files changed, 79 insertions(+), 146 deletions(-) diff --git a/includes/discovery/os/saf.inc.php b/includes/discovery/os/saf.inc.php index fd9ccf0685..70bd1e68b5 100644 --- a/includes/discovery/os/saf.inc.php +++ b/includes/discovery/os/saf.inc.php @@ -1,7 +1,5 @@ = 8) { - $os = 'sentry4'; - } else { - $os = 'sentry3'; - } + // It appears that version 8 and up is good for sentry4 + if ($version >= 8) { + $os = 'sentry4'; + } else { + $os = 'sentry3'; } } diff --git a/includes/discovery/os/serveriron.inc.php b/includes/discovery/os/serveriron.inc.php index 2ab8244c80..f8c8877eaa 100644 --- a/includes/discovery/os/serveriron.inc.php +++ b/includes/discovery/os/serveriron.inc.php @@ -1,18 +1,16 @@ "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Total connections in this device - "snL4slbLimitExceeds" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // exceeds snL4TCPSynLimit (numbers of connection per second) - "snL4slbForwardTraffic" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Client->Server - "snL4slbReverseTraffic" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Server->Client - "snL4slbFinished" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // FIN_or_RST - "snL4FreeSessionCount" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Maximum sessions - used sessions - "snL4unsuccessfulConn" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Unsuccessfull connection - ); +if (str_contains('ServerIron', $sysDescr)) { + $os = 'serveriron'; + $serviron_mibs = array ( + "snL4slbTotalConnections" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Total connections in this device + "snL4slbLimitExceeds" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // exceeds snL4TCPSynLimit (numbers of connection per second) + "snL4slbForwardTraffic" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Client->Server + "snL4slbReverseTraffic" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Server->Client + "snL4slbFinished" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // FIN_or_RST + "snL4FreeSessionCount" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Maximum sessions - used sessions + "snL4unsuccessfulConn" => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB", // Unsuccessfull connection + ); - register_mibs($device, $serviron_mibs, "includes/discovery/os/serveriron.inc.php"); - } + register_mibs($device, $serviron_mibs, "includes/discovery/os/serveriron.inc.php"); } diff --git a/includes/discovery/os/sharp.inc.php b/includes/discovery/os/sharp.inc.php index 5b93c93f3c..f48ada211f 100644 --- a/includes/discovery/os/sharp.inc.php +++ b/includes/discovery/os/sharp.inc.php @@ -1,6 +1,5 @@ */ -if (!$os) { - if (strpos($sysDescr, 'Huawei Integrated Access Software') !== false) { - $os = 'smartax'; - } +if (str_contains('Huawei Integrated Access Software', $sysDescr)) { + $os = 'smartax'; } diff --git a/includes/discovery/os/solaris.inc.php b/includes/discovery/os/solaris.inc.php index 8cbcfc34a4..674c627adc 100644 --- a/includes/discovery/os/solaris.inc.php +++ b/includes/discovery/os/solaris.inc.php @@ -1,21 +1,18 @@ '5.10') { +if (starts_with('SunOS', $sysDescr)) { + $os = 'solaris'; + list(,,$version) = explode(' ', $sysDescr); + + if(version_compare($version, '5.10', '>')) { + if (str_contains('oi_', $sysDescr)) { + $os = 'openindiana'; + } else { $os = 'opensolaris'; } - - if ($version > '5.10') { - if (preg_match('/oi_/', $sysDescr)) { - $os = 'openindiana'; - } - } - } - - if (strstr($sysObjectId, '.1.3.6.1.4.1.42.2.1.1')) { - $os = 'solaris'; } } + +if (str_contains('.1.3.6.1.4.1.42.2.1.1', $sysObjectId)) { + $os = 'solaris'; +} diff --git a/includes/discovery/os/sonicwall.inc.php b/includes/discovery/os/sonicwall.inc.php index 42a0f8640e..932f15d77c 100644 --- a/includes/discovery/os/sonicwall.inc.php +++ b/includes/discovery/os/sonicwall.inc.php @@ -1,7 +1,5 @@ Date: Thu, 22 Sep 2016 02:47:07 +0300 Subject: [PATCH 024/126] fix for test units --- includes/discovery/os/watchguard.inc.php | 2 +- includes/discovery/os/windows.inc.php | 4 +++- includes/discovery/os/wxgoos.inc.php | 2 +- includes/discovery/os/xirrus.inc.php | 6 ++++-- includes/discovery/os/zxr10.inc.php | 4 +++- includes/discovery/os/zywall.inc.php | 4 +++- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/includes/discovery/os/watchguard.inc.php b/includes/discovery/os/watchguard.inc.php index 9928c22bc0..972d2d98a9 100644 --- a/includes/discovery/os/watchguard.inc.php +++ b/includes/discovery/os/watchguard.inc.php @@ -1,5 +1,5 @@ Date: Thu, 22 Sep 2016 03:58:29 +0300 Subject: [PATCH 025/126] passing all tests --- includes/discovery/os/watchguard.inc.php | 4 ++-- includes/discovery/os/windows.inc.php | 8 +++++--- includes/discovery/os/wxgoos.inc.php | 6 +++++- includes/discovery/os/xirrus.inc.php | 6 ++---- includes/discovery/os/zxr10.inc.php | 6 ++---- includes/discovery/os/zynos.inc.php | 2 +- includes/discovery/os/zywall.inc.php | 8 +++++--- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/includes/discovery/os/watchguard.inc.php b/includes/discovery/os/watchguard.inc.php index 972d2d98a9..05818f4de4 100644 --- a/includes/discovery/os/watchguard.inc.php +++ b/includes/discovery/os/watchguard.inc.php @@ -1,5 +1,5 @@ Date: Thu, 22 Sep 2016 04:23:00 +0300 Subject: [PATCH 026/126] newline --- includes/discovery/os/watchguard.inc.php | 2 +- includes/discovery/os/wxgoos.inc.php | 2 +- includes/discovery/os/zxr10.inc.php | 2 +- includes/discovery/os/zywall.inc.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/discovery/os/watchguard.inc.php b/includes/discovery/os/watchguard.inc.php index 05818f4de4..ad5934b892 100644 --- a/includes/discovery/os/watchguard.inc.php +++ b/includes/discovery/os/watchguard.inc.php @@ -2,4 +2,4 @@ if (starts_with('WatchGuard Fireware', $sysDescr) || starts_with('.1.3.6.1.4.1.3097.1.5', $sysObjectId)) { $os = 'firebox'; -} \ No newline at end of file +} diff --git a/includes/discovery/os/wxgoos.inc.php b/includes/discovery/os/wxgoos.inc.php index b1ed3600c1..569546ac37 100644 --- a/includes/discovery/os/wxgoos.inc.php +++ b/includes/discovery/os/wxgoos.inc.php @@ -6,4 +6,4 @@ if (str_contains('NETOS 6.0', $sysDescr)) { if (starts_with($sysObjectId, array('.1.3.6.1.4.1.901.1', '.1.3.6.1.4.1.17373'))) { $os = 'wxgoos'; -} \ No newline at end of file +} diff --git a/includes/discovery/os/zxr10.inc.php b/includes/discovery/os/zxr10.inc.php index 420f93c055..c7448e21b3 100644 --- a/includes/discovery/os/zxr10.inc.php +++ b/includes/discovery/os/zxr10.inc.php @@ -2,4 +2,4 @@ if (str_contains($sysDescr, array('ZXR10', 'ZTE Ethernet Switch'))) { $os = 'zxr10'; -} \ No newline at end of file +} diff --git a/includes/discovery/os/zywall.inc.php b/includes/discovery/os/zywall.inc.php index bf7a66b3ff..254351a09c 100644 --- a/includes/discovery/os/zywall.inc.php +++ b/includes/discovery/os/zywall.inc.php @@ -6,4 +6,4 @@ if (starts_with('ZyWALL 2X', $sysDescr)) { if (strstr($sysObjectId, '.1.3.6.1.4.1.890.1.15')) { $os = 'zywall'; -} \ No newline at end of file +} From d662399c76186c870b7353fc5c24fd0c8b1670b7 Mon Sep 17 00:00:00 2001 From: sorano Date: Thu, 22 Sep 2016 13:49:40 +0200 Subject: [PATCH 027/126] Update RRDCached.md Added apostrophe's around rrdtool_version number to prevent incorrect config syntax. --- doc/Extensions/RRDCached.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Extensions/RRDCached.md b/doc/Extensions/RRDCached.md index f881e9c683..824713e994 100644 --- a/doc/Extensions/RRDCached.md +++ b/doc/Extensions/RRDCached.md @@ -8,7 +8,7 @@ If you have rrdcached 1.5.5 or above, we can also tune over rrdcached. To enable this set the following config: ```php -$config['rrdtool_version'] = 1.5.5; +$config['rrdtool_version'] = '1.5.5'; ``` ### Support matrix From 2ec3132c64adc9cf6d0c310ae249eab1b7e9c135 Mon Sep 17 00:00:00 2001 From: Bennett Blodinger Date: Thu, 22 Sep 2016 08:09:31 -0400 Subject: [PATCH 028/126] close icon element --- includes/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/common.php b/includes/common.php index b14b317817..73cf1d4f0a 100644 --- a/includes/common.php +++ b/includes/common.php @@ -135,7 +135,7 @@ function print_message($text) if (isCli()) { c_echo("%g".$text."%n\n"); } else { - echo('