Add macro "check_source" for hosts and services to use them in notifi…

…cation mails fixes Icinga#8277 Signed-off-by: Gunnar Beutner <[email protected]>
red61wjt · Jan 25, 2015 · 2d393ea · 2d393ea
1 parent a4bfa99
commit 2d393ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/doc/3-monitoring-basics.md b/doc/3-monitoring-basics.md
@@ -2045,6 +2045,7 @@ hosts or services:
   host.output                  | The last check's output.
   host.perfdata                | The last check's performance data.
   host.last_check              | The timestamp when the last check was executed.
+  host.check_source            | The monitoring instance that performed the last check.
   host.num_services            | Number of services associated with the host.
   host.num_services_ok         | Number of services associated with the host which are in an `OK` state.
   host.num_services_warning    | Number of services associated with the host which are in a `WARNING` state.
@@ -2076,6 +2077,7 @@ services:
   service.output             | The last check's output.
   service.perfdata           | The last check's performance data.
   service.last_check         | The timestamp when the last check was executed.
+  service.check_source       | The monitoring instance that performed the last check.
 
 ### <a id="command-runtime-macros"></a> Command Runtime Macros
 

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
@@ -280,6 +280,9 @@ bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, Value *res
 		} else if (macro == "last_check") {
 			*result = Convert::ToString((long)cr->GetScheduleStart());
 			return true;
+		} else if (macro == "check_source") {
+			*result = cr->GetCheckSource();
+			return true;
 		}
 	}
 

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
@@ -178,6 +178,9 @@ bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Valu
 		} else if (macro == "last_check") {
 			*result = Convert::ToString((long)cr->GetExecutionEnd());
 			return true;
+		} else if (macro == "check_source") {
+			*result = cr->GetCheckSource();
+			return true;
 		}
 	}