IcingaDB: Set state_type to hard or soft and not int

This commit is contained in:
Yonas Habteab 2025-05-20 17:14:35 +02:00
parent 953a2e2e96
commit ef1c0eb9b3

View File

@ -1974,7 +1974,7 @@ void IcingaDB::SendStateChange(const ConfigObject::Ptr& object, const CheckResul
"id", HashValue(rawId), "id", HashValue(rawId),
"environment_id", m_EnvironmentId, "environment_id", m_EnvironmentId,
"host_id", GetObjectIdentifier(host), "host_id", GetObjectIdentifier(host),
"state_type", Convert::ToString(type), "state_type", Checkable::StateTypeToString(type).ToLower(),
"soft_state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetState()) : Convert::ToLong(Host::CalculateState(cr->GetState())) : 99), "soft_state", Convert::ToString(cr ? service ? Convert::ToLong(cr->GetState()) : Convert::ToLong(Host::CalculateState(cr->GetState())) : 99),
"hard_state", Convert::ToString(hard_state), "hard_state", Convert::ToString(hard_state),
"check_attempt", Convert::ToString(checkable->GetCheckAttempt()), "check_attempt", Convert::ToString(checkable->GetCheckAttempt()),
@ -2954,7 +2954,7 @@ Dictionary::Ptr IcingaDB::SerializeState(const Checkable::Ptr& checkable)
*/ */
attrs->Set("id", id); attrs->Set("id", id);
attrs->Set("environment_id", m_EnvironmentId); attrs->Set("environment_id", m_EnvironmentId);
attrs->Set("state_type", checkable->HasBeenChecked() ? checkable->GetStateType() : StateTypeHard); attrs->Set("state_type", Checkable::StateTypeToString(checkable->HasBeenChecked() ? checkable->GetStateType() : StateTypeHard).ToLower());
// TODO: last_hard/soft_state should be "previous". // TODO: last_hard/soft_state should be "previous".
if (service) { if (service) {