starlingx
/
metal
Code Issues Proposed changes

Re-enable sensor suppression support in Mtce Hardware Monitor 

Sensor and sensorgroup suppression was temporarily disabled in
Debian while System Inventory was modified to align API types
with database types.

That update is now merged so this update removes the Debian only
gate on sensor and sensorgroup suppression.

Test Plan:

PASS: Verify Debian build and install
PASS: Verify CentOS build and install
PASS: Verify multiple individual sensor suppression/unsuppression
PASS: Verify sensorgroup suppression/unsuppression
PASS: Verify host degrade and alarm mgmt for each above 2 cases

Story: 2009968
Task: 45964
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
Change-Id: I34abf6bd7c72df2f7da743e4f20300956248c6d7
This commit is contained in:
Eric MacDonald 2022-08-06 00:02:29 +00:00
parent bfe663f2f5
commit 038eb198fd
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mtce/src/hwmon/hwmonHttp.cpp
View File

@ -1660,14 +1660,11 @@ int hwmonHttp_add_sensor ( string & hostname,
event.payload.append ("\",\"audit_interval\":") ;
event.payload.append ("0");
if ( daemon_is_os_debian () == false )
{
event.payload.append (",\"suppress\":\"") ;
if ( sensor.suppress == true )
event.payload.append ("True\"");
else
event.payload.append ("False\"");
}
event.payload.append (",\"suppress\":\"") ;
if ( sensor.suppress == true )
event.payload.append ("True\"");
else
event.payload.append ("False\"");
event.payload.append ("}");
@ -1846,14 +1843,11 @@ int hwmonHttp_add_group ( string & hostname,
event.payload.append ("\",\"audit_interval_group\":") ;
event.payload.append (itos(sensor_group.group_interval));
if ( daemon_is_os_debian () == false )
{
event.payload.append (",\"suppress\":\"") ;
if ( sensor_group.suppress == true )
event.payload.append ("True\"");
else
event.payload.append ("False\"");
}
event.payload.append (",\"suppress\":\"") ;
if ( sensor_group.suppress == true )
event.payload.append ("True\"");
else
event.payload.append ("False\"");
event.payload.append ("}");