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

Add icinga, cluster, cluster-zone check information to the ApiListener status handler

Browse Source 
fixes #8093
This commit is contained in:
Michael Friedrich 2015-09-23 18:09:46 +02:00
parent 4ef9761fee
commit aa12a4e75c
1 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/remote/apilistener.cpp
View File

@ -857,12 +857,14 @@ std::pair<Dictionary::Ptr, Dictionary::Ptr> ApiListener::GetStatus(void)
/* cluster stats */ /* cluster stats */
status->Set("identity", GetIdentity()); status->Set("identity", GetIdentity());
double count_endpoints = 0; double allEndpoints = 0;
Array::Ptr not_connected_endpoints = new Array(); Array::Ptr allNotConnectedEndpoints = new Array();
Array::Ptr connected_endpoints = new Array(); Array::Ptr allConnectedEndpoints = new Array();
Zone::Ptr my_zone = Zone::GetLocalZone(); Zone::Ptr my_zone = Zone::GetLocalZone();
Dictionary::Ptr connectedZones = new Dictionary();
BOOST_FOREACH(const Zone::Ptr& zone, ConfigType::GetObjectsByType<Zone>()) { BOOST_FOREACH(const Zone::Ptr& zone, ConfigType::GetObjectsByType<Zone>()) {
/* only check endpoints in a) the same zone b) our parent zone c) immediate child zones */ /* only check endpoints in a) the same zone b) our parent zone c) immediate child zones */
if (my_zone != zone && my_zone != zone->GetParent() && zone != my_zone->GetParent()) { if (my_zone != zone && my_zone != zone->GetParent() && zone != my_zone->GetParent()) {
@ -871,28 +873,64 @@ std::pair<Dictionary::Ptr, Dictionary::Ptr> ApiListener::GetStatus(void)
continue; continue;
} }
bool zoneConnected = false;
int countZoneEndpoints = 0;
double zoneLag = 0;
Array::Ptr zoneEndpoints = new Array();
BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) { BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) {
zoneEndpoints->Add(endpoint->GetName());
if (endpoint->GetName() == GetIdentity()) if (endpoint->GetName() == GetIdentity())
continue; continue;
count_endpoints++; double eplag = Utility::GetTime() - endpoint->GetRemoteLogPosition();
if (!endpoint->IsConnected()) if ((endpoint->GetSyncing() || !endpoint->IsConnected()) && eplag > zoneLag)
not_connected_endpoints->Add(endpoint->GetName()); zoneLag = eplag;
else
connected_endpoints->Add(endpoint->GetName()); allEndpoints++;
countZoneEndpoints++;
if (!endpoint->IsConnected()) {
allNotConnectedEndpoints->Add(endpoint->GetName());
} else {
allConnectedEndpoints->Add(endpoint->GetName());
zoneConnected = true;
}
} }
/* if there's only one endpoint inside the zone, we're not connected - that's us, fake it */
if (zone->GetEndpoints().size() == 1 && countZoneEndpoints == 0)
zoneConnected = true;
Dictionary::Ptr zoneStats = new Dictionary();
zoneStats->Set("connected", zoneConnected);
zoneStats->Set("client_log_lag", zoneLag);
zoneStats->Set("endpoints", zoneEndpoints);
String parentZoneName;
Zone::Ptr parentZone = zone->GetParent();
if (parentZone)
parentZoneName = parentZone->GetName();
zoneStats->Set("parent_zone", parentZoneName);
connectedZones->Set(zone->GetName(), zoneStats);
} }
status->Set("num_endpoints", count_endpoints); status->Set("num_endpoints", allEndpoints);
status->Set("num_conn_endpoints", connected_endpoints->GetLength()); status->Set("num_conn_endpoints", allConnectedEndpoints->GetLength());
status->Set("num_not_conn_endpoints", not_connected_endpoints->GetLength()); status->Set("num_not_conn_endpoints", allNotConnectedEndpoints->GetLength());
status->Set("conn_endpoints", connected_endpoints); status->Set("conn_endpoints", allConnectedEndpoints);
status->Set("not_conn_endpoints", not_connected_endpoints); status->Set("not_conn_endpoints", allNotConnectedEndpoints);
perfdata->Set("num_endpoints", count_endpoints); status->Set("zones", connectedZones);
perfdata->Set("num_conn_endpoints", Convert::ToDouble(connected_endpoints->GetLength()));
perfdata->Set("num_not_conn_endpoints", Convert::ToDouble(not_connected_endpoints->GetLength())); perfdata->Set("num_endpoints", allEndpoints);
perfdata->Set("num_conn_endpoints", Convert::ToDouble(allConnectedEndpoints->GetLength()));
perfdata->Set("num_not_conn_endpoints", Convert::ToDouble(allNotConnectedEndpoints->GetLength()));
return std::make_pair(status, perfdata); return std::make_pair(status, perfdata);
} }