[icinga-checkins] icinga.org: icinga2/master: Remove unnecessary template imports in the ITL

git at icinga.org git at icinga.org
Thu Nov 24 09:40:28 CET 2016


Module: icinga2
Branch: master
Commit: 22fa4773df8fd0353466ff9e7100e2029152ba3e
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=22fa4773df8fd0353466ff9e7100e2029152ba3e

Author: Gunnar Beutner <gunnar.beutner at icinga.com>
Date:   Thu Nov 24 09:39:49 2016 +0100

Remove unnecessary template imports in the ITL

refs #12575

---

 itl/command-plugins.conf                    |    1 -
 itl/plugins-contrib.d/logmanagement.conf    |    2 +-
 itl/plugins-contrib.d/operating-system.conf |    2 +-
 itl/plugins-contrib.d/web.conf              |    3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 9ccd1e7..7660147 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -2244,7 +2244,6 @@ object CheckCommand "mysql_query" {
 }
 
 object CheckCommand "radius" {
-	import "plugin-check-command"
 	import "ipv4-or-ipv6"
 
 	command = [
diff --git a/itl/plugins-contrib.d/logmanagement.conf b/itl/plugins-contrib.d/logmanagement.conf
index a85f943..dc5a9ab 100644
--- a/itl/plugins-contrib.d/logmanagement.conf
+++ b/itl/plugins-contrib.d/logmanagement.conf
@@ -18,8 +18,8 @@
  ******************************************************************************/
 
 object CheckCommand "logstash" {
-	import "plugin-check-command"
 	command = [ PluginContribDir + "/check_logstash" ]
+
 	arguments = {
 		"-H" = {
 			value = "$logstash_hostname$"
diff --git a/itl/plugins-contrib.d/operating-system.conf b/itl/plugins-contrib.d/operating-system.conf
index 3c76124..c0a96c5 100644
--- a/itl/plugins-contrib.d/operating-system.conf
+++ b/itl/plugins-contrib.d/operating-system.conf
@@ -149,8 +149,8 @@ object CheckCommand "iostat" {
 }
 
 object CheckCommand "iostats" {
-        import "plugin-check-command"
         command = [ PluginContribDir + "/check_iostats" ]
+
         arguments = {
                 "-d" = {
                         value = "$iostats_disk$"
diff --git a/itl/plugins-contrib.d/web.conf b/itl/plugins-contrib.d/web.conf
index e8999c0..d574ee4 100644
--- a/itl/plugins-contrib.d/web.conf
+++ b/itl/plugins-contrib.d/web.conf
@@ -211,7 +211,6 @@ object CheckCommand "jmx4perl" {
 }
 
 object CheckCommand "squid" {
-	import "plugin-check-command"
 	import "ipv4-or-ipv6"
 
 	command = [ PluginContribDir + "/check_squid" ]
@@ -260,7 +259,6 @@ object CheckCommand "squid" {
 }
 
 object CheckCommand "nginx_status" {
-		import "plugin-check-command"
 		import "ipv4-or-ipv6"
 
 		command = [ PluginContribDir + "/check_nginx_status.pl" ]
@@ -329,7 +327,6 @@ object CheckCommand "nginx_status" {
 }
 
 object CheckCommand "apache-status" {
-	import "plugin-check-command"
 	import "ipv4-or-ipv6"
 
 	command = [ PluginContribDir + "/check_apache_status.pl" ]



More information about the icinga-checkins mailing list