From 5ac03849d209a74ae2c63cd5959609bc56b99eeb Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 11 Nov 2014 14:05:28 +0100 Subject: [PATCH] GelfWriter: Add 'source' configuration attribute refs #7619 --- lib/perfdata/gelfwriter.cpp | 9 ++++++--- lib/perfdata/gelfwriter.ti | 3 +++ lib/perfdata/perfdata-type.conf | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp index 4bcc06316..9e6bdb95f 100644 --- 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(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 a3c49ab79..f5e4d20de 100644 --- 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 d5bdff5b6..611c89591 100644 --- 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" }