tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-22 01:08:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Introduce Endpoint#pending_outgoing_messages for the API

Browse Source
This commit is contained in:
Alexander A. Klimov 2024-12-11 17:21:08 +01:00
parent 2495a9ed12
commit 731d3211ab
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/methods/clusterzonechecktask.cpp
View File

@ -133,6 +133,7 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
double lastMessageSent = 0; double lastMessageSent = 0;
double lastMessageReceived = 0; double lastMessageReceived = 0;
uint_fast64_t pendingOutgoingMessages = 0;
double messagesSentPerSecond = 0; double messagesSentPerSecond = 0;
double messagesReceivedPerSecond = 0; double messagesReceivedPerSecond = 0;
double bytesSentPerSecond = 0; double bytesSentPerSecond = 0;
@ -156,6 +157,7 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
if (endpoint->GetLastMessageReceived() > lastMessageReceived) if (endpoint->GetLastMessageReceived() > lastMessageReceived)
lastMessageReceived = endpoint->GetLastMessageReceived(); lastMessageReceived = endpoint->GetLastMessageReceived();
pendingOutgoingMessages += endpoint->GetPendingOutgoingMessages();
messagesSentPerSecond += endpoint->GetMessagesSentPerSecond(); messagesSentPerSecond += endpoint->GetMessagesSentPerSecond();
messagesReceivedPerSecond += endpoint->GetMessagesReceivedPerSecond(); messagesReceivedPerSecond += endpoint->GetMessagesReceivedPerSecond();
bytesSentPerSecond += endpoint->GetBytesSentPerSecond(); bytesSentPerSecond += endpoint->GetBytesSentPerSecond();
@ -207,6 +209,7 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
new PerfdataValue("slave_lag", zoneLag, false, "s", lagWarning, lagCritical), new PerfdataValue("slave_lag", zoneLag, false, "s", lagWarning, lagCritical),
new PerfdataValue("last_messages_sent", lastMessageSent), new PerfdataValue("last_messages_sent", lastMessageSent),
new PerfdataValue("last_messages_received", lastMessageReceived), new PerfdataValue("last_messages_received", lastMessageReceived),
new PerfdataValue("sum_pending_outgoing_messages", pendingOutgoingMessages),
new PerfdataValue("sum_messages_sent_per_second", messagesSentPerSecond), new PerfdataValue("sum_messages_sent_per_second", messagesSentPerSecond),
new PerfdataValue("sum_messages_received_per_second", messagesReceivedPerSecond), new PerfdataValue("sum_messages_received_per_second", messagesReceivedPerSecond),
new PerfdataValue("sum_bytes_sent_per_second", bytesSentPerSecond), new PerfdataValue("sum_bytes_sent_per_second", bytesSentPerSecond),

3
lib/methods/icingachecktask.cpp
View File

@ -123,6 +123,7 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
double lastMessageSent = 0; double lastMessageSent = 0;
double lastMessageReceived = 0; double lastMessageReceived = 0;
uint_fast64_t pendingOutgoingMessages = 0;
double messagesSentPerSecond = 0; double messagesSentPerSecond = 0;
double messagesReceivedPerSecond = 0; double messagesReceivedPerSecond = 0;
double bytesSentPerSecond = 0; double bytesSentPerSecond = 0;
@ -136,6 +137,7 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
if (endpoint->GetLastMessageReceived() > lastMessageReceived) if (endpoint->GetLastMessageReceived() > lastMessageReceived)
lastMessageReceived = endpoint->GetLastMessageReceived(); lastMessageReceived = endpoint->GetLastMessageReceived();
pendingOutgoingMessages += endpoint->GetPendingOutgoingMessages();
messagesSentPerSecond += endpoint->GetMessagesSentPerSecond(); messagesSentPerSecond += endpoint->GetMessagesSentPerSecond();
messagesReceivedPerSecond += endpoint->GetMessagesReceivedPerSecond(); messagesReceivedPerSecond += endpoint->GetMessagesReceivedPerSecond();
bytesSentPerSecond += endpoint->GetBytesSentPerSecond(); bytesSentPerSecond += endpoint->GetBytesSentPerSecond();
@ -144,6 +146,7 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
perfdata->Add(new PerfdataValue("last_messages_sent", lastMessageSent)); perfdata->Add(new PerfdataValue("last_messages_sent", lastMessageSent));
perfdata->Add(new PerfdataValue("last_messages_received", lastMessageReceived)); perfdata->Add(new PerfdataValue("last_messages_received", lastMessageReceived));
perfdata->Add(new PerfdataValue("sum_pending_outgoing_messages", pendingOutgoingMessages));
perfdata->Add(new PerfdataValue("sum_messages_sent_per_second", messagesSentPerSecond)); perfdata->Add(new PerfdataValue("sum_messages_sent_per_second", messagesSentPerSecond));
perfdata->Add(new PerfdataValue("sum_messages_received_per_second", messagesReceivedPerSecond)); perfdata->Add(new PerfdataValue("sum_messages_received_per_second", messagesReceivedPerSecond));
perfdata->Add(new PerfdataValue("sum_bytes_sent_per_second", bytesSentPerSecond)); perfdata->Add(new PerfdataValue("sum_bytes_sent_per_second", bytesSentPerSecond));

12
lib/remote/endpoint.cpp
View File

@ -101,6 +101,18 @@ Endpoint::Ptr Endpoint::GetLocalEndpoint()
return listener->GetLocalEndpoint(); return listener->GetLocalEndpoint();
} }
uint_fast64_t Endpoint::GetPendingOutgoingMessages() const
{
uint_fast64_t pending = 0;
std::unique_lock lock (m_ClientsLock);
for (auto& client : m_Clients) {
pending += client->GetPendingOutgoingMessages();
}
return pending;
}
void Endpoint::AddMessageSent(int bytes) void Endpoint::AddMessageSent(int bytes)
{ {
double time = Utility::GetTime(); double time = Utility::GetTime();

1
lib/remote/endpoint.hpp
View File

@ -39,6 +39,7 @@ public:
static Endpoint::Ptr GetLocalEndpoint(); static Endpoint::Ptr GetLocalEndpoint();
void SetCachedZone(const intrusive_ptr<Zone>& zone); void SetCachedZone(const intrusive_ptr<Zone>& zone);
uint_fast64_t GetPendingOutgoingMessages() const override;
void AddMessageSent(int bytes); void AddMessageSent(int bytes);
void AddMessageReceived(int bytes); void AddMessageReceived(int bytes);

4
lib/remote/endpoint.ti
View File

@ -39,6 +39,10 @@ class Endpoint : ConfigObject
Timestamp last_message_sent; Timestamp last_message_sent;
Timestamp last_message_received; Timestamp last_message_received;
[no_user_modify, no_storage] uint_fast64_t pending_outgoing_messages {
get;
};
[no_user_modify, no_storage] double messages_sent_per_second { [no_user_modify, no_storage] double messages_sent_per_second {
get; get;
}; };