Merge pull request #6829 from Icinga/feature/api-events-notification-…

…command API Event Streams: Add 'command' for Notification events
Icinga · Dec 17, 2018 · eab49d3 · eab49d3
2 parents 75e06e9 + ba8d79f
commit eab49d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/doc/12-icinga2-api.md b/doc/12-icinga2-api.md
@@ -1333,6 +1333,7 @@ Example for all downtime events:
   timestamp     | Timestamp     | Unix timestamp when the event happened.
   host	        | String        | [Host](09-object-types.md#objecttype-host) name.
   service       | String        | [Service](09-object-types.md#objecttype-service) name. Optional if this is a host notification.
+  command       | String        | [NotificationCommand](09-object-types.md#objecttype-notificationcommand) name.
   users         | Array         | List of notified [user](09-object-types.md#objecttype-user) names.
   notification\_type | String   | [$notification.type$](03-monitoring-basics.md#notification-runtime-macros) runtime macro value.
   author        | String        | [$notification.author$](03-monitoring-basics.md#notification-runtime-macros) runtime macro value.

diff --git a/lib/icinga/apievents.cpp b/lib/icinga/apievents.cpp
@@ -19,6 +19,7 @@
 
 #include "icinga/apievents.hpp"
 #include "icinga/service.hpp"
+#include "icinga/notificationcommand.hpp"
 #include "remote/eventqueue.hpp"
 #include "base/initialize.hpp"
 #include "base/serializer.hpp"
@@ -129,6 +130,11 @@ void ApiEvents::NotificationSentToAllUsersHandler(const Notification::Ptr& notif
 	if (service)
 		result->Set("service", service->GetShortName());
 
+	NotificationCommand::Ptr command = notification->GetCommand();
+
+	if (command)
+		result->Set("command", command->GetName());
+
 	ArrayData userNames;
 
 	for (const User::Ptr& user : users) {