diff --git a/mtce/centos/build_srpm.data b/mtce/centos/build_srpm.data index 80bd36f0..7f0c94fb 100644 --- a/mtce/centos/build_srpm.data +++ b/mtce/centos/build_srpm.data @@ -1,3 +1,3 @@ SRC_DIR="src" -TIS_PATCH_VER=153 +TIS_PATCH_VER=154 BUILD_IS_SLOW=5 diff --git a/mtce/src/common/nodeClass.cpp b/mtce/src/common/nodeClass.cpp index ec3c3096..7814ac4b 100755 --- a/mtce/src/common/nodeClass.cpp +++ b/mtce/src/common/nodeClass.cpp @@ -5004,7 +5004,10 @@ int nodeLinkClass::collectd_notify_handler ( string & hostname, * "hwmon" - The Hardware Monitor process * **********************************************************************************/ -int nodeLinkClass::node_degrade_control ( string & hostname, int state, string service ) +int nodeLinkClass::node_degrade_control ( string & hostname, + int state, + string service, + string sensor ) { int rc = FAIL_UNKNOWN_HOSTNAME ; @@ -5013,7 +5016,7 @@ int nodeLinkClass::node_degrade_control ( string & hostname, int state, string s { unsigned int service_flag = 0 ; - /* convert service string to degrade mask flag + /* convert service string to degrade mask flag * - handle empty string and unsupported service */ if ( service.empty() ) { @@ -5053,7 +5056,10 @@ int nodeLinkClass::node_degrade_control ( string & hostname, int state, string s { if (( node_ptr->degrade_mask & service_flag ) == 0 ) { - wlog ("%s degrade 'assert' from '%s'\n", hostname.c_str(), service.c_str() ); + wlog ("%s degrade 'assert' from '%s' (%s)\n", + hostname.c_str(), + service.c_str(), + sensor.empty() ? "" : sensor.c_str() ); node_ptr->degrade_mask |= service_flag ; } rc = PASS ; diff --git a/mtce/src/common/nodeClass.h b/mtce/src/common/nodeClass.h index 756faebb..6a72250a 100755 --- a/mtce/src/common/nodeClass.h +++ b/mtce/src/common/nodeClass.h @@ -1808,7 +1808,7 @@ public: /** Hardware Process Monitor Degrade Event handler. * see implementation for details */ - int node_degrade_control ( string & hostname, int state, string service ); + int node_degrade_control ( string & hostname, int state, string service, string sensor ); /** Hardware Monitor 'Action' Event method * diff --git a/mtce/src/maintenance/mtcCtrlMsg.cpp b/mtce/src/maintenance/mtcCtrlMsg.cpp index f5019a4d..67d9a7a9 100755 --- a/mtce/src/maintenance/mtcCtrlMsg.cpp +++ b/mtce/src/maintenance/mtcCtrlMsg.cpp @@ -399,7 +399,8 @@ int mtc_service_inbox ( nodeLinkClass * obj_ptr, { if ( ( rc1 = jsonUtil_get_key_val(&msg.buf[0], MTC_JSON_SERVICE, service )) == PASS ) { - if (( msg.cmd == MTC_EVENT_HWMON_CLEAR ) || + if (( msg.cmd == MTC_DEGRADE_RAISE ) || + ( msg.cmd == MTC_EVENT_HWMON_CLEAR ) || ( msg.cmd == MTC_EVENT_HWMON_MINOR ) || ( msg.cmd == MTC_EVENT_HWMON_MAJOR ) || ( msg.cmd == MTC_EVENT_HWMON_CRIT ) || @@ -529,7 +530,7 @@ int mtc_service_inbox ( nodeLinkClass * obj_ptr, service.c_str()); obj_ptr->node_degrade_control ( hostname, MTC_DEGRADE_CLEAR, - service ); + service, sensor ); break ; } case MTC_EVENT_HWMON_MINOR: @@ -543,7 +544,7 @@ int mtc_service_inbox ( nodeLinkClass * obj_ptr, sensor.empty() ? "" : sensor.c_str()); obj_ptr->node_degrade_control ( hostname, MTC_DEGRADE_RAISE, - sensor ); + service, sensor ); break ; } case MTC_EVENT_HWMON_RESET: