tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 06:34:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10467 from Icinga/icingadb-calceventid-no-double-timestamptomilliseconds

Browse Source 
IcingaDB::CalcEventID: No milliseconds as eventTime
This commit is contained in:
Julian Brost 2025-06-10 17:09:16 +02:00 committed by GitHub
commit b27310fb6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/icingadb/icingadb-objects.cpp
View File

@ -2453,17 +2453,17 @@ void IcingaDB::SendFlappingChange(const Checkable::Ptr& checkable, double change
xAdd.emplace_back(GetObjectIdentifier(endpoint)); xAdd.emplace_back(GetObjectIdentifier(endpoint));
} }
long long startTime; double startTime;
if (checkable->IsFlapping()) { if (checkable->IsFlapping()) {
startTime = TimestampToMilliseconds(changeTime); startTime = changeTime;
xAdd.emplace_back("event_type"); xAdd.emplace_back("event_type");
xAdd.emplace_back("flapping_start"); xAdd.emplace_back("flapping_start");
xAdd.emplace_back("percent_state_change_start"); xAdd.emplace_back("percent_state_change_start");
xAdd.emplace_back(Convert::ToString(checkable->GetFlappingCurrent())); xAdd.emplace_back(Convert::ToString(checkable->GetFlappingCurrent()));
} else { } else {
startTime = TimestampToMilliseconds(flappingLastChange); startTime = flappingLastChange;
xAdd.emplace_back("event_type"); xAdd.emplace_back("event_type");
xAdd.emplace_back("flapping_end"); xAdd.emplace_back("flapping_end");
@ -2473,12 +2473,14 @@ void IcingaDB::SendFlappingChange(const Checkable::Ptr& checkable, double change
xAdd.emplace_back(Convert::ToString(checkable->GetFlappingCurrent())); xAdd.emplace_back(Convert::ToString(checkable->GetFlappingCurrent()));
} }
long long startTs = TimestampToMilliseconds(startTime);
xAdd.emplace_back("start_time"); xAdd.emplace_back("start_time");
xAdd.emplace_back(Convert::ToString(startTime)); xAdd.emplace_back(Convert::ToString(startTs));
xAdd.emplace_back("event_id"); xAdd.emplace_back("event_id");
xAdd.emplace_back(CalcEventID(checkable->IsFlapping() ? "flapping_start" : "flapping_end", checkable, startTime)); xAdd.emplace_back(CalcEventID(checkable->IsFlapping() ? "flapping_start" : "flapping_end", checkable, startTime));
xAdd.emplace_back("id"); xAdd.emplace_back("id");
xAdd.emplace_back(HashValue(new Array({m_EnvironmentId, checkable->GetName(), startTime}))); xAdd.emplace_back(HashValue(new Array({m_EnvironmentId, checkable->GetName(), startTs})));
m_HistoryBulker.ProduceOne(std::move(xAdd)); m_HistoryBulker.ProduceOne(std::move(xAdd));
} }
@ -2556,14 +2558,14 @@ void IcingaDB::SendAcknowledgementSet(const Checkable::Ptr& checkable, const Str
xAdd.emplace_back(Convert::ToString(TimestampToMilliseconds(expiry))); xAdd.emplace_back(Convert::ToString(TimestampToMilliseconds(expiry)));
} }
long long setTime = TimestampToMilliseconds(changeTime); long long setTs = TimestampToMilliseconds(changeTime);
xAdd.emplace_back("set_time"); xAdd.emplace_back("set_time");
xAdd.emplace_back(Convert::ToString(setTime)); xAdd.emplace_back(Convert::ToString(setTs));
xAdd.emplace_back("event_id"); xAdd.emplace_back("event_id");
xAdd.emplace_back(CalcEventID("ack_set", checkable, setTime)); xAdd.emplace_back(CalcEventID("ack_set", checkable, changeTime));
xAdd.emplace_back("id"); xAdd.emplace_back("id");
xAdd.emplace_back(HashValue(new Array({m_EnvironmentId, checkable->GetName(), setTime}))); xAdd.emplace_back(HashValue(new Array({m_EnvironmentId, checkable->GetName(), setTs})));
m_HistoryBulker.ProduceOne(std::move(xAdd)); m_HistoryBulker.ProduceOne(std::move(xAdd));
} }
@ -2606,14 +2608,14 @@ void IcingaDB::SendAcknowledgementCleared(const Checkable::Ptr& checkable, const
xAdd.emplace_back(GetObjectIdentifier(endpoint)); xAdd.emplace_back(GetObjectIdentifier(endpoint));
} }
long long setTime = TimestampToMilliseconds(ackLastChange); long long setTs = TimestampToMilliseconds(ackLastChange);
xAdd.emplace_back("set_time"); xAdd.emplace_back("set_time");
xAdd.emplace_back(Convert::ToString(setTime)); xAdd.emplace_back(Convert::ToString(setTs));
xAdd.emplace_back("event_id"); xAdd.emplace_back("event_id");
xAdd.emplace_back(CalcEventID("ack_clear", checkable, setTime)); xAdd.emplace_back(CalcEventID("ack_clear", checkable, ackLastChange));
xAdd.emplace_back("id"); xAdd.emplace_back("id");
xAdd.emplace_back(HashValue(new Array({m_EnvironmentId, checkable->GetName(), setTime}))); xAdd.emplace_back(HashValue(new Array({m_EnvironmentId, checkable->GetName(), setTs})));
if (!removedBy.IsEmpty()) { if (!removedBy.IsEmpty()) {
xAdd.emplace_back("cleared_by"); xAdd.emplace_back("cleared_by");