tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7906 from Icinga/feature/icingadb-flapping-history-percent-state-change-start_end 

Icinga DB - Flapping history: Add percent_state_change_start/end
This commit is contained in:
Noah Hilverling 2020-03-10 16:40:18 +01:00 committed by GitHub
parent 7af15ae66e 595ffc438e
commit 1c9cab6add
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1644,7 +1644,6 @@ void IcingaDB::SendFlappingChange(const Checkable::Ptr& checkable, double change
"XADD", "icinga:history:stream:flapping", "*", "XADD", "icinga:history:stream:flapping", "*",
"environment_id", SHA1(GetEnvironment()), "environment_id", SHA1(GetEnvironment()),
"host_id", GetObjectIdentifier(host), "host_id", GetObjectIdentifier(host),
"percent_state_change", Convert::ToString(checkable->GetFlappingCurrent()),
"flapping_threshold_low", Convert::ToString(checkable->GetFlappingThresholdLow()), "flapping_threshold_low", Convert::ToString(checkable->GetFlappingThresholdLow()),
"flapping_threshold_high", Convert::ToString(checkable->GetFlappingThresholdHigh()), "flapping_threshold_high", Convert::ToString(checkable->GetFlappingThresholdHigh()),
"event_id", Utility::NewUniqueID() "event_id", Utility::NewUniqueID()
@ -1674,6 +1673,8 @@ void IcingaDB::SendFlappingChange(const Checkable::Ptr& checkable, double change
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(Convert::ToString(checkable->GetFlappingCurrent()));
} else { } else {
startTime = TimestampToMilliseconds(flappingLastChange); startTime = TimestampToMilliseconds(flappingLastChange);
@ -1681,6 +1682,8 @@ void IcingaDB::SendFlappingChange(const Checkable::Ptr& checkable, double change
xAdd.emplace_back("flapping_end"); xAdd.emplace_back("flapping_end");
xAdd.emplace_back("end_time"); xAdd.emplace_back("end_time");
xAdd.emplace_back(Convert::ToString(TimestampToMilliseconds(changeTime))); xAdd.emplace_back(Convert::ToString(TimestampToMilliseconds(changeTime)));
xAdd.emplace_back("percent_state_change_end");
xAdd.emplace_back(Convert::ToString(checkable->GetFlappingCurrent()));
} }
xAdd.emplace_back("start_time"); xAdd.emplace_back("start_time");