Revert "WebUI: Sensors page modifications"
This reverts commit 2f481e4cb83f0c72a9f3aad11431e4abcf5d632c.
"/xyz/openbmc_project/sensors/power/" sensors (e.g. p0_vcs_power)
and "/xyz/openbmc_project/sensors/current/" sensors
(e.g. p0_vcs_current) are no longer on the GUI Sensors Page.
Since all sensors do not map to Thermal or Power, the
SensorCollection, /redfish/v1/Chassis/{ChassisId}/Sensors,
needs to be implemented before we move the GUI sensors page
over to Redfish.
The SensorCollection contains all sensors not covered elsewhere
in the model.
The SensorCollection will contain all sensors under
/current and all non-powersupply sensors under /power.
IBM is planning on working on the SensorCollection, it will be
sometime before the code is in because of this, reverting
moving the GUI sensor page over to Redfish.
Apologies on not catching this in the review.
For more information see:
https://redfishforum.com/thread/190/sensorcollection-contain-all-sensors-chassis
https://redfish.dmtf.org/schemas/SensorCollection.json
Tested: The current and power sensors are back on the Sensor page.
Change-Id: Ia818fc05b49a8181b71f8756a6066c27e94dc46e
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index 3ad4aa6..5a6f95a 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -5,11 +5,12 @@
</div>
<section class="row column">
<div class="page-header">
- <h2 class="inline">All Sensors information </h2>
- <a ng-href="data:text/json;charset=utf-8,{{fullSensorsInfo}}" class="inline btn-export float-right" download="{{export_name}}">Export</a>
+ <h2 class="inline">All sensors present in the system</h2>
+ <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export float-right" download="{{export_name}}">Export</a>
</div>
</section>
<section class="row column">
+ <!-- search -->
<p class="content-label" aria-label="sensors filter">Filter sensors</p>
<div class="content__search">
<label for="content__search-input">Sensors Search</label>
@@ -18,7 +19,7 @@
<button class="clear-input" ng-click="clear()">✕</button>
<input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
</div>
- </div>
+ </div> <!-- end search -->
<div class="toggle-filter">
<p class="content-label">FILTER BY SEVERITY</p>
@@ -31,74 +32,41 @@
<button class="inline" ng-click="toggleSeverity('warning')"
ng-class="selectedSeverity.warning ? 'btn-primary' : 'btn-secondary'">Warning
</button>
- <button class="inline" ng-click="toggleSeverity('ok')"
- ng-class="selectedSeverity.ok ? 'btn-primary' : 'btn-secondary'">OK
+ <button class="inline" ng-click="toggleSeverity('normal')"
+ ng-class="selectedSeverity.normal ? 'btn-primary' : 'btn-secondary'">Normal
</button>
</div>
- <div class="select__filter">
- <p class="content-label">Select Component</p>
- <div class="inline dropdown__wrapper" >
- <button type="button" class="dropdown__button" ng-click="showCompDropdown = !showCompDropdown" ng-disabled="fullSensorsInfo.length <= 1"><strong>{{selectedComponent.Name}}</strong></button>
- <ul class="dropdown__list inline" ng-show="showCompDropdown">
- <li>
- <button type="button" ng-click="selectComponent(-1);">All</button>
- </li>
- <li ng-repeat="component in fullSensorsInfo track by $index">
- <button type="button" ng-click="selectComponent($index);">{{component.Name}}</button>
- </li>
- </ul>
- </div>
- </div>
+
</section>
- <section class="row column" ng-show="(filteredVoltSensors.length + filteredTempSensors.length + filteredFanSensors.length) == 0">
+ <section class="row column" ng-show="filteredSensorData.length == 0">
+ <!-- message -->
<span ng-if="selectedSeverity.all">{{messages.NO_SENSOR_DATA}}</span>
<span ng-if="selectedSeverity.critical">{{messages.CRITICAL_NO_SENSOR_DATA}}</span>
<span ng-if="selectedSeverity.warning">{{messages.WARNING_NO_SENSOR_DATA}}</span>
- <span ng-if="selectedSeverity.ok">{{messages.NORMAL_NO_SENSOR_DATA}}</span>
+ <span ng-if="selectedSeverity.normal">{{messages.NORMAL_NO_SENSOR_DATA}}</span>
+ <!-- end message -->
</section>
- <section id="sensor-categories" class="table row column" ng-hide="(filteredVoltSensors.length + filteredTempSensors.length + filteredFanSensors.length) == 0">
- <div class="table row column sensor__table" ng-hide="loading">
- <div class="table__head fixed-table-header">
- <div class="table__row">
- <div class="table__cell sensor__title">Name</div>
- <div class="table__cell sensor__status">Status</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">LC</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">LW</div>
- <div class="table__cell sensor__reading">Reading</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">HW</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">HC</div>
- </div>
- </div>
- <div class="table__body">
- <div class="table__row" ng-repeat="sensor in (filteredVoltSensors = (sensorsInfo.Voltages | filter:filterBySearchTerms | filter:filterBySeverity))">
- <div class="table__cell sensor__title">{{sensor.Name}}</div>
- <div class="table__cell sensor__status sensor__{{sensor.Status.Health}}">{{sensor.Status.Health}}</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.LowerThresholdCritical | number:2}} Volts</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.LowerThresholdNonCritical | number:2}} Volts</div>
- <div class="table__cell sensor__reading">{{sensor.ReadingVolts | number:2}} Volts</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.UpperThresholdNonCritical | number:2}} Volts</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.UpperThresholdCritical | number:2}} Volts</div>
- </div>
- <div class="table__row" ng-repeat="sensor in (filteredTempSensors = (sensorsInfo.Temperatures | filter:filterBySearchTerms | filter:filterBySeverity))">
- <div class="table__cell sensor__title">{{sensor.Name}}</div>
- <div class="table__cell sensor__status sensor__{{sensor.Status.Health}}">{{sensor.Status.Health}}</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.LowerThresholdCritical | number:2}} °C</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.LowerThresholdNonCritical | number:2}} °C</div>
- <div class="table__cell sensor__reading">{{sensor.ReadingCelsius | number:2}} °C</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.UpperThresholdNonCritical | number:2}} °C</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.UpperThresholdCritical | number:2}} °C</div>
- </div>
- <div class="table__row" ng-repeat="sensor in (filteredFanSensors = (sensorsInfo.Fans | filter:filterBySearchTerms | filter:filterBySeverity))">
- <div class="table__cell sensor__title">{{sensor.Name}}</div>
- <div class="table__cell sensor__status sensor__{{sensor.Status.Health}}">{{sensor.Status.Health}}</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.LowerThresholdCritical | number:2}} {{sensor.ReadingUnits}}</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">{{sensor.LowerThresholdNonCritical | number:2}} {{sensor.ReadingUnits}}</div>
- <div class="table__cell sensor__reading">{{sensor.Reading | number:2}} {{sensor.ReadingUnits}}</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">NA</div>
- <div class="table__cell sensor__threshold" ng-show="showThresholds">NA</div>
- </div>
- </div>
+
+ <section id="sensor-categories" class="row column" ng-show="filteredSensorData.length">
+ <div class="row column header-row fixed-table-header">
+ <div class="column large-12 header__actions-bar">
+ <p class="inline sensor__title">Sensors ({{filteredSensorData.length}})</p>
+ <p class="inline sensor__reading">Low critical</p>
+ <p class="inline sensor__reading">Low warning</p>
+ <p class="inline sensor__reading sensor__heading-current">Current</p>
+ <p class="inline sensor__reading">High warning</p>
+ <p class="inline sensor__reading">High critical</p>
</div>
+ </div>
+ <!-- sensor -->
+ <div class="sensor__readings-row" ng-repeat="sensor in data|filter:filterBySeverity|filter:filterBySearchTerms|orderBy:'+custom_order' as filteredSensorData">
+ <p class="inline sensor__title"><span class="icon" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="sensor.status" ></span>{{sensor.title}}</p>
+ <p class="inline sensor__reading"><span class="sensor__label">Low critical</span>{{sensor.CriticalLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">°</span></p>
+ <p class="inline sensor__reading"><span class="sensor__label">Low warning</span>{{sensor.WarningLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">°</span></p>
+ <p class="inline sensor__reading sensor__current" ng-class="{'sensor__critical': sensor.status == 'critical', 'sensor__warn': sensor.status == 'warning', 'sensor__normal': sensor.status == 'normal'}"><span class="sensor__label">Current</span>{{sensor.Value}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">°</span></span></p>
+ <p class="inline sensor__reading"><span class="sensor__label">High warning</span>{{sensor.WarningHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">°</span></p>
+ <p class="inline sensor__reading"><span class="sensor__label">High critical</span>{{sensor.CriticalHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">°</span></p>
+ </div>
</section>
</div>