mirror of
https://github.com/librenms/librenms.git
synced 2024-09-22 02:48:37 +00:00
more options to amap
This commit is contained in:
crcro
parent
f42406e2b0
commit
aad9b675c3
@ -1872,7 +1872,6 @@ label {
|
||||
.device-availability, .service-availability {
|
||||
color:#000000;
|
||||
float:left;
|
||||
width:163px;
|
||||
height:64px;
|
||||
margin:10px;
|
||||
padding:8px;
|
||||
|
||||
@ -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[] = '
|
||||
<form class="form-horizontal" onsubmit="return widget_settings(this)">
|
||||
<div class="form-group">
|
||||
<label for="tile_width" class="col-sm-4 control-label">Tile width</label>
|
||||
<div class="col-sm-6">
|
||||
<input class="form-control" name="tile_width" placeholder="I.e 10" value="'.$current_width.'">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="show_services" class="col-sm-4 control-label">Show</label>
|
||||
<div class="col-sm-6">
|
||||
<select class="form-control" name="mode">';
|
||||
|
||||
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[] = '
|
||||
<a href="' . generate_url(array('page' => 'device', 'device' => $device['device_id'])) . '" title="' . $device['hostname'] . " - " . formatUptime($device['uptime']) . '">
|
||||
<div class="device-availability ' . $deviceState . '" style="width:' . $config['webui']['availability_map_direct_tile_size'] . 'px;">
|
||||
<span class="availability-label label ' . $deviceLabel . ' label-font-border">' . $deviceState . '</span>
|
||||
<span class="device-icon">' . $deviceIcon . '</span><br>
|
||||
<span class="small">' . shorthost(ip_to_sysname($device, $device['hostname'])) . '</span>
|
||||
</div>
|
||||
</a>';
|
||||
} else {
|
||||
$temp_output[] = '
|
||||
<a href="' . generate_url(array('page' => 'device', 'device' => $device['device_id'])) . '" title="' . $device['hostname'] . " - " . formatUptime($device['uptime']) . '">
|
||||
<span class="label ' . $deviceLabel . ' widget-availability label-font-border">' . $deviceState . '</span>
|
||||
</a>';
|
||||
}
|
||||
} else {
|
||||
$temp_output[] = '<a href="' . generate_url(array('page' => 'device', 'device' => $device['device_id'])) . '" title="' . $device['hostname'] . " - " . formatUptime($device['uptime']) . '"><div class="' . $deviceLabelOld . '" style="width:' . $config['webui']['availability_map_old_widget_tile_size'] . 'px;"></div></a>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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[] = '
|
||||
<a href="' . generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])) . '" title="' . $service['hostname'] . " - " . $service['service_type'] . " - " . $service['service_desc'] . '">
|
||||
<div class="service-availability ' . $serviceState . '" style="width:' . $config['webui']['availability_map_direct_tile_size'] . 'px;">
|
||||
<span class="service-name-label label ' . $serviceLabel . ' label-font-border">' . $service["service_type"] . '</span>
|
||||
<span class="availability-label label ' . $serviceLabel . ' label-font-border">' . $serviceState . '</span>
|
||||
<span class="device-icon">' . $deviceIcon . '</span><br>
|
||||
<span class="small">' . shorthost(ip_to_sysname($service, $service['hostname'])) . '</span>
|
||||
</div>
|
||||
</a>';
|
||||
} else {
|
||||
$temp_output[] = '
|
||||
<a href="' . generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])) . '" title="' . $service['hostname'] . " - " . $service['service_type'] . " - " . $service['service_desc'] . '">
|
||||
<span class="label ' . $serviceLabel . ' widget-availability label-font-border">' . $service['service_type'] . ' - ' . $serviceState . '</span>
|
||||
</a>';
|
||||
}
|
||||
} else {
|
||||
$temp_output[] = '<a href="' . generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])) . '" title="' . $service['hostname'] . " - " . $service['service_type'] . " - " . $service['service_desc'] . '"><div class="' . $serviceLabelOld . '" style="width:' . $config['webui']['availability_map_old_widget_tile_size'] . 'px;"></div></a>';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$temp_output [] = '';
|
||||
}
|
||||
}
|
||||
|
||||
if ($directpage == "yes") {
|
||||
$temp_header[] = '
|
||||
<div class="page-availability-title-left">
|
||||
<span class="page-availability-title">Availability map for</span>
|
||||
<select id="mode" class="page-availability-report-select" name="mode">';
|
||||
|
||||
if ($config['show_services'] == 0) {
|
||||
$common_output[] = '<option value="0" selected="selected">only devices</option>';
|
||||
$temp_header[] = '<option value="0" selected>only devices</option>';
|
||||
} else {
|
||||
foreach ($select_modes as $mode_select => $option) {
|
||||
if ($mode_select == $mode) {
|
||||
@ -53,249 +183,71 @@ if (defined('SHOW_SETTINGS')) {
|
||||
} else {
|
||||
$selected = '';
|
||||
}
|
||||
$common_output[] = '<option value="'.$mode_select.'" '.$selected.'>'.$option.'</option>';
|
||||
}
|
||||
}
|
||||
$common_output[] ='
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-6 col-sm-4"><button type="submit" class="btn btn-primary">Set</button></div>
|
||||
</div>
|
||||
</form>';
|
||||
} 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[] = '
|
||||
<a href="'.generate_url(array('page' => 'device', 'device' => $device['device_id'])).'" title="'.$device['hostname']." - ".formatUptime($device['uptime']).'">
|
||||
<div class="device-availability '.$deviceState.'">
|
||||
<span class="availability-label label '.$deviceLabel.' label-font-border">'.$deviceState.'</span>
|
||||
<span class="device-icon">'.$deviceIcon.'</span><br>
|
||||
<span class="small">'.shorthost(ip_to_sysname($device, $device['hostname'])).'</span>
|
||||
</div>
|
||||
</a>';
|
||||
} else {
|
||||
$temp_output[] = '
|
||||
<a href="'.generate_url(array('page' => 'device', 'device' => $device['device_id'])).'" title="'.$device['hostname']." - ".formatUptime($device['uptime']).'">
|
||||
<span class="label '.$deviceLabel.' widget-availability label-font-border">'.$deviceState.'</span>
|
||||
</a>';
|
||||
}
|
||||
} else {
|
||||
$temp_output[] = '<a href="'.generate_url(array('page' => 'device', 'device' => $device['device_id'])).'" title="'.$device['hostname']." - ".formatUptime($device['uptime']).'"><div class="'.$deviceLabelOld.'"></div></a>';
|
||||
}
|
||||
$temp_header[] = '<option value="' . $mode_select . '" ' . $selected . '>' . $option . '</option>';
|
||||
}
|
||||
}
|
||||
|
||||
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[] = '
|
||||
<a href="'.generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])).'" title="'.$service['hostname']." - ".$service['service_type']." - ".$service['service_desc'].'">
|
||||
<div class="service-availability '.$serviceState.'">
|
||||
<span class="service-name-label label '.$serviceLabel.' label-font-border">'.$service["service_type"].'</span>
|
||||
<span class="availability-label label '.$serviceLabel.' label-font-border">'.$serviceState.'</span>
|
||||
<span class="device-icon">'.$deviceIcon.'</span><br>
|
||||
<span class="small">'.shorthost(ip_to_sysname($service, $service['hostname'])).'</span>
|
||||
</div>
|
||||
</a>';
|
||||
} else {
|
||||
$temp_output[] = '
|
||||
<a href="'.generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])).'" title="'.$service['hostname']." - ".$service['service_type']." - ".$service['service_desc'].'">
|
||||
<span class="label '.$serviceLabel.' widget-availability label-font-border">'.$service['service_type'].' - '.$serviceState.'</span>
|
||||
</a>';
|
||||
}
|
||||
} else {
|
||||
$temp_output[] = '<a href="'.generate_url(array('page' => 'device', 'tab' => 'services', 'device' => $service['device_id'])).'" title="'.$service['hostname']." - ".$service['service_type']." - ".$service['service_desc'].'"><div class="'.$serviceLabelOld.'"></div></a>';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$temp_output [] = '';
|
||||
}
|
||||
}
|
||||
|
||||
if ($directpage == "yes") {
|
||||
$temp_header[] = '
|
||||
<div class="page-availability-title-left">
|
||||
<span class="page-availability-title">Availability map for</span>
|
||||
<select id="mode" class="page-availability-report-select" name="mode">';
|
||||
|
||||
if ($config['show_services'] == 0) {
|
||||
$temp_header[] = '<option value="0" selected>only devices</option>';
|
||||
} else {
|
||||
foreach ($select_modes as $mode_select => $option) {
|
||||
if ($mode_select == $mode) {
|
||||
$selected = 'selected';
|
||||
} else {
|
||||
$selected = '';
|
||||
}
|
||||
$temp_header[] = '<option value="'.$mode_select.'" '.$selected.'>'.$option.'</option>';
|
||||
}
|
||||
}
|
||||
|
||||
$temp_header[] =
|
||||
'</select>
|
||||
$temp_header[] =
|
||||
'</select>
|
||||
</div>
|
||||
<div class="page-availability-title-right">';
|
||||
|
||||
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[] = '
|
||||
<span class="page-availability-title">Device group</span>
|
||||
<select id="group" class="page-availability-report-select" name="group">
|
||||
<option value="0" ' . $selected . '>show all devices</option>';
|
||||
|
||||
foreach ($dev_groups as $dev_group) {
|
||||
if ($_SESSION['group_view'] == $dev_group['id']) {
|
||||
$selected = 'selected';
|
||||
} else {
|
||||
$selected = '';
|
||||
}
|
||||
|
||||
$temp_header[] = '
|
||||
<span class="page-availability-title">Device group</span>
|
||||
<select id="group" class="page-availability-report-select" name="group">
|
||||
<option value="0" '.$selected.'>show all devices</option>';
|
||||
|
||||
foreach ($dev_groups as $dev_group) {
|
||||
if ($_SESSION['group_view'] == $dev_group['id']) {
|
||||
$selected = 'selected';
|
||||
} else {
|
||||
$selected = '';
|
||||
}
|
||||
$temp_header[] = '<option value="'.$dev_group['id'].'" '.$selected.'>'.$dev_group['name'].'</option>';
|
||||
}
|
||||
$temp_header[] = '</select>';
|
||||
$temp_header[] = '<option value="' . $dev_group['id'] . '" ' . $selected . '>' . $dev_group['name'] . '</option>';
|
||||
}
|
||||
$temp_header[] = '</select>';
|
||||
}
|
||||
|
||||
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[] = '
|
||||
<div class="'.$deviceClass.'">
|
||||
<span>Total hosts</span>
|
||||
<span class="label label-success label-font-border label-border">up: '.$host_up_count.'</span>
|
||||
<span class="label label-warning label-font-border label-border">warn: '.$host_warn_count.'</span>
|
||||
<span class="label label-danger label-font-border label-border">down: '.$host_down_count.'</span>
|
||||
</div>';
|
||||
}
|
||||
|
||||
if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) {
|
||||
$temp_header[] = '
|
||||
<div class="'.$serviceClass.'">
|
||||
<span>Total services</span>
|
||||
<span class="label label-success label-font-border label-border">up: '.$service_up_count.'</span>
|
||||
<span class="label label-warning label-font-border label-border">warn: '.$service_warn_count.'</span>
|
||||
<span class="label label-danger label-font-border label-border">down: '.$service_down_count.'</span>
|
||||
</div>';
|
||||
}
|
||||
|
||||
$temp_header[] = '</div>';
|
||||
$temp_header[] = '<br style="clear:both;">';
|
||||
|
||||
$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[] = '
|
||||
<div class="' . $deviceClass . '">
|
||||
<span>Total hosts</span>
|
||||
<span class="label label-success label-font-border label-border">up: ' . $host_up_count . '</span>
|
||||
<span class="label label-warning label-font-border label-border">warn: ' . $host_warn_count . '</span>
|
||||
<span class="label label-danger label-font-border label-border">down: ' . $host_down_count . '</span>
|
||||
</div>';
|
||||
}
|
||||
|
||||
if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) {
|
||||
$temp_header[] = '
|
||||
<div class="' . $serviceClass . '">
|
||||
<span>Total services</span>
|
||||
<span class="label label-success label-font-border label-border">up: ' . $service_up_count . '</span>
|
||||
<span class="label label-warning label-font-border label-border">warn: ' . $service_warn_count . '</span>
|
||||
<span class="label label-danger label-font-border label-border">down: ' . $service_down_count . '</span>
|
||||
</div>';
|
||||
}
|
||||
|
||||
$temp_header[] = '</div>';
|
||||
$temp_header[] = '<br style="clear:both;">';
|
||||
|
||||
$common_output = array_merge($temp_header, $temp_output);
|
||||
|
||||
@ -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(),
|
||||
<input id="'.$item['name'].'" class="form-control" type="text" name="global-config-input" value="'.$config_groups[$item['name']]['config_value'].'" data-config_id="'.$config_groups[$item['name']]['config_id'].'">
|
||||
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
|
||||
';
|
||||
} elseif ($item['type'] == 'numeric') {
|
||||
$output .= '
|
||||
<input id="'.$item['name'].'" class="form-control" onkeypress="return (event.charCode == 8 || event.charCode == 0) ? null : event.charCode >= 48 && event.charCode <= 57" type="text" name="global-config-input" value="'.$config_groups[$item['name']]['config_value'].'" data-config_id="'.$config_groups[$item['name']]['config_id'].'">
|
||||
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
|
||||
';
|
||||
} elseif ($item['type'] == 'select') {
|
||||
$output .= '
|
||||
<select id="'.$config_groups[$item['name']]['name'].'" class="form-control" name="global-config-select" data-config_id="'.$config_groups[$item['name']]['config_id'].'">
|
||||
|
||||
@ -19,18 +19,26 @@ $graph_conf = array(
|
||||
);
|
||||
|
||||
$availability_map_conf = array(
|
||||
array('name' => 'webui.old_availability_map',
|
||||
array('name' => 'webui.availability_map_old',
|
||||
'descr' => 'Availability map old view',
|
||||
'type' => 'checkbox',
|
||||
),
|
||||
array('name' => 'webui.availability_map_sort_status',
|
||||
'descr' => 'Sort devices by status',
|
||||
'descr' => 'Device sort by status',
|
||||
'type' => 'checkbox',
|
||||
),
|
||||
array('name' => 'webui.availability_map_use_device_groups',
|
||||
'descr' => 'Use device groups filter',
|
||||
'descr' => 'Device groups filtering',
|
||||
'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(
|
||||
|
||||
3
sql-schema/133.sql
Normal file
3
sql-schema/133.sql
Normal file
@ -0,0 +1,3 @@
|
||||
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 the 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 the desired tile width in pixels for widget mode', 'webui', 0, 'graph', 0, '0', '0');
|
||||
UPDATE `config` SET `config_name` = 'webui.availability_map_old' WHERE `config_name` = 'webui.old_availability_map';
|
||||
Loading…
Reference in New Issue
Block a user