GelfWriter: Add 'source' configuration attribute

refs #7619

diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp
index 4bcc06316d58da685543c6abb3f3b52b38d7ec27..9e6bdb95fd273b31361498b0f38e1cf1d41824fd 100644 (file)
--- a/lib/perfdata/gelfwriter.cpp
+++ b/lib/perfdata/gelfwriter.cpp
@@ -79,6 +79,9 @@ void GelfWriter::CheckResultHandler(const Checkable::Ptr& checkable, const Check
 {
        CONTEXT("GELF Processing check result for '" + checkable->GetName() + "'");
 
+       Log(LogDebug, "GelfWriter")
+           << "GELF Processing check result for '" << checkable->GetName() << "'";
+
        Dictionary::Ptr fields = new Dictionary();
        Service::Ptr service = dynamic_pointer_cast<Service>(checkable);
        Host::Ptr host;
@@ -94,7 +97,7 @@ void GelfWriter::CheckResultHandler(const Checkable::Ptr& checkable, const Check
        fields->Set("short_message", cr->GetOutput());
        fields->Set("_type", "CHECK RESULT");
 
-       SendLogMessage(ComposeGelfMessage(fields, "icinga"));
+       SendLogMessage(ComposeGelfMessage(fields, GetSource()));
 }
 
 void GelfWriter::NotificationToUserHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable,
@@ -134,7 +137,7 @@ void GelfWriter::NotificationToUserHandler(const Notification::Ptr& notification
        fields->Set("_state", notification_type_str);
        fields->Set("_comment", author_comment);
 
-       SendLogMessage(ComposeGelfMessage(fields, "icinga"));
+       SendLogMessage(ComposeGelfMessage(fields, GetSource()));
 }
 
 void GelfWriter::StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type)
@@ -165,7 +168,7 @@ void GelfWriter::StateChangeHandler(const Checkable::Ptr& checkable, const Check
                fields->Set("_check_source", cr->GetCheckSource());
        }
 
-       SendLogMessage(ComposeGelfMessage(fields, "icinga"));
+       SendLogMessage(ComposeGelfMessage(fields, GetSource()));
 }
 
 String GelfWriter::ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source)

diff --git a/lib/perfdata/gelfwriter.ti b/lib/perfdata/gelfwriter.ti
index a3c49ab79b003f220530d49d8576253217ba64dd..f5e4d20de22dc561bbe4975cf388d5b107e2b7b8 100644 (file)
--- a/lib/perfdata/gelfwriter.ti
+++ b/lib/perfdata/gelfwriter.ti
@@ -30,6 +30,9 @@ class GelfWriter : DynamicObject
        [config] String port {
                default {{{ return "12201"; }}}
        };
+       [config] String source {
+               default {{{ return "icinga2"; }}}
+       };
 };
 
 }

diff --git a/lib/perfdata/perfdata-type.conf b/lib/perfdata/perfdata-type.conf
index d5bdff5b658a039d6b57e4a819b0555d8acf94aa..611c89591ece06c9104b25623d5faba54bd36018 100644 (file)
--- a/lib/perfdata/perfdata-type.conf
+++ b/lib/perfdata/perfdata-type.conf
@@ -36,6 +36,7 @@
 
 %type GelfWriter {
         %attribute %string "host",
-        %attribute %string "port"
+        %attribute %string "port",
+        %attribute %string "source"
 }