[icinga-checkins] icinga.org: icinga2/feature/gelf-writer-7619: Add a type validafor for GelfWriter

git at icinga.org git at icinga.org
Mon Nov 10 20:27:22 CET 2014


Module: icinga2
Branch: feature/gelf-writer-7619
Commit: 7444b830fbe7c3a51d4df2a2a33c4155eaf2dac4
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=7444b830fbe7c3a51d4df2a2a33c4155eaf2dac4

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Mon Nov 10 20:09:54 2014 +0100

Add a type validafor for GelfWriter

refs #7619

---

 lib/perfdata/gelfwriter.ti      |    6 ------
 lib/perfdata/perfdata-type.conf |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/perfdata/gelfwriter.ti b/lib/perfdata/gelfwriter.ti
index 5018f70..a3c49ab 100644
--- a/lib/perfdata/gelfwriter.ti
+++ b/lib/perfdata/gelfwriter.ti
@@ -30,12 +30,6 @@ class GelfWriter : DynamicObject
 	[config] String port {
 		default {{{ return "12201"; }}}
 	};
-	[config] String host_name_template {
-		default {{{ return "icinga.$host.name$"; }}}
-	};
-	[config] String service_name_template {
-		default {{{ return "icinga.$host.name$.$service.name$"; }}}
-	};
 };
 
 }
diff --git a/lib/perfdata/perfdata-type.conf b/lib/perfdata/perfdata-type.conf
index 011a881..d5bdff5 100644
--- a/lib/perfdata/perfdata-type.conf
+++ b/lib/perfdata/perfdata-type.conf
@@ -33,3 +33,9 @@
 	%attribute %string "host_name_template",
 	%attribute %string "service_name_template"
 }
+
+%type GelfWriter {
+        %attribute %string "host",
+        %attribute %string "port"
+}
+



More information about the icinga-checkins mailing list