clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 18:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

count sensor cleanups (#9707)

Browse Source
This commit is contained in:
Tony Murray 2019-01-20 13:37:08 -06:00 committed by GitHub
parent e0da083f5c
commit 45e0e5e19a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/ViewComposers/MenuComposer.php
View File

@ -116,7 +116,7 @@ class MenuComposer
if (in_array($class, ['fanspeed', 'humidity', 'temperature', 'signal'])) {
// First group
$group = 0;
} elseif (in_array($class, ['current', 'frequency', 'power', 'voltage'])) {
} elseif (in_array($class, ['current', 'frequency', 'power', 'voltage', 'power_factor', 'power_consumed'])) {
// Second group
$group = 1;
} else {
@ -126,6 +126,7 @@ class MenuComposer
$sensor_menu[$group][] = $sensor_model;
}
ksort($sensor_menu); // ensure menu order
$vars['sensor_menu'] = $sensor_menu;
// Wireless menu

43
app/Models/Sensor.php
View File

@ -8,28 +8,31 @@ class Sensor extends BaseModel
protected $primaryKey = 'sensor_id';
protected static $icons = array(
'fanspeed' => 'tachometer',
'humidity' => 'tint',
'temperature' => 'thermometer-full',
'current' => 'bolt',
'frequency' => 'line-chart',
'power' => 'power-off',
'voltage' => 'bolt',
'airflow' => 'angle-double-right',
'ber' => 'sort-amount-desc',
'charge' => 'battery-half',
'chromatic_dispersion' => 'indent',
'cooling' => 'thermometer-full',
'count' => 'hashtag',
'current' => 'bolt fa-flip-horizontal',
'dbm' => 'sun-o',
'delay' => 'clock-o',
'eer' => 'snowflake-o',
'fanspeed' => 'refresh',
'frequency' => 'line-chart',
'humidity' => 'tint',
'load' => 'percent',
'power' => 'power-off',
'power_consumed' => 'plug',
'power_factor' => 'calculator',
'pressure' => 'thermometer-empty',
'quality_factor' => 'arrows',
'runtime' => 'hourglass-half',
'state' => 'bullseye',
'signal' => 'wifi',
'snr' => 'signal',
'pressure' => 'thermometer-empty',
'cooling' => 'thermometer-full',
'airflow' => 'angle-double-right',
'delay' => 'clock-o',
'chromatic_dispersion' => 'indent',
'ber' => 'sort-amount-desc',
'quality_factor' => 'arrows',
'eer' => 'snowflake-o',
'state' => 'bullseye',
'temperature' => 'thermometer-three-quarters',
'voltage' => 'bolt',
'waterflow' => 'tint',
);
@ -48,7 +51,13 @@ class Sensor extends BaseModel
public function icon()
{
return collect(self::$icons)->get($this->sensor_class, 'heartbeat');
return collect(self::$icons)->get($this->sensor_class, 'delicius');
}
// for the legacy menu
public static function getIconMap()
{
return self::$icons;
}
// ---- Query Scopes ----

29
html/includes/print-menubar.php
View File

@ -385,35 +385,8 @@ if ($menu_sensors) {
echo(' <li role="presentation" class="divider"></li>');
}
$icons = array(
'fanspeed' => 'tachometer',
'humidity' => 'tint',
'temperature' => 'thermometer-full',
'current' => 'bolt',
'frequency' => 'line-chart',
'power' => 'power-off',
'power_consumed' => 'plug',
'power_factor' => 'calculator',
'voltage' => 'bolt',
'charge' => 'battery-half',
'count' => 'hashtag',
'dbm' => 'sun-o',
'load' => 'percent',
'runtime' => 'hourglass-half',
'state' => 'bullseye',
'signal' => 'wifi',
'snr' => 'signal',
'pressure' => 'thermometer-empty',
'cooling' => 'thermometer-full',
'airflow' => 'angle-double-right',
'delay' => 'clock-o',
'chromatic_dispersion' => 'indent',
'ber' => 'sort-amount-desc',
'quality_factor' => 'arrows',
'eer' => 'snowflake-o',
'waterflow' => 'tint',
$icons = \App\Models\Sensor::getIconMap();
);
foreach (array('fanspeed','humidity','temperature','signal') as $item) {
if (isset($menu_sensors[$item])) {
echo(' <li><a href="health/metric='.$item.'/"><i class="fa fa-'.$icons[$item].' fa-fw fa-lg" aria-hidden="true"></i> '.nicecase($item).'</a></li>');

58
html/pages/device/overview/generic/sensor.inc.php
View File

@ -6,62 +6,8 @@ if ($sensor_class == 'state') {
}
if (count($sensors)) {
switch (strtolower($sensor_type)) {
case "charge":
$sensor_fa_icon = "fa-battery-half";
break;
case "temperature":
$sensor_fa_icon = "fa-thermometer-three-quarters";
break;
case "humidity":
$sensor_fa_icon = "fa-tint";
break;
case "fanspeed":
$sensor_fa_icon = "fa-asterisk";
break;
case "voltage":
$sensor_fa_icon = "fa-bolt";
break;
case "current":
$sensor_fa_icon = "fa-bolt";
break;
case "frequency":
$sensor_fa_icon = "fa-line-chart";
break;
case "runtime":
$sensor_fa_icon = "fa-hourglass";
break;
case "power":
$sensor_fa_icon = "fa-power-off";
break;
case "power_consumed":
$sensor_fa_icon = "fa-plug";
break;
case "power_factor":
$sensor_fa_icon = "fa-calculator";
break;
case "dBm":
$sensor_fa_icon = "fa-signal";
break;
case "state":
$sensor_fa_icon = "fa-bullseye";
break;
case "count":
$sensor_fa_icon = "fa-hashtag";
break;
case "load":
$sensor_fa_icon = "fa-percent";
break;
case "signal":
$sensor_fa_icon = "fa-signal";
break;
case "airflow":
$sensor_fa_icon = "fa-superpowers";
break;
default:
$sensor_fa_icon = "fa-delicious";
break;
}//end switch
$icons = \App\Models\Sensor::getIconMap();
$sensor_fa_icon = 'fa-' . (isset($icons[$sensor_class]) ? $icons[$sensor_class] : 'delicious');
echo '
<div class="row">

3
html/pages/health/sensors.inc.php
View File

@ -58,6 +58,9 @@ switch ($class) {
case 'state':
$pagetitle[] = "Health :: State";
break;
case 'count':
$pagetitle[] = "Health :: Count";
break;
case 'temperature':
$pagetitle[] = "Health :: Temperature";
break;