From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Mon, 22 Jul 2019 07:37:48 +0000 (+0200)
Subject: ITL: Align plugins-contrib.d to PluginContribDir
X-Git-Tag: v2.11.0-rc1~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F7345%2Fhead;p=icinga2

ITL: Align plugins-contrib.d to PluginContribDir

That was missing in the past reviews.
---

diff --git a/itl/plugins-contrib.d/big-data.conf b/itl/plugins-contrib.d/big-data.conf
index 83cc6244f..7d3d6f173 100644
--- a/itl/plugins-contrib.d/big-data.conf
+++ b/itl/plugins-contrib.d/big-data.conf
@@ -1,7 +1,7 @@
 /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 object CheckCommand "cloudera_service_status" {
-	command = [ PluginDir + "/check_cloudera_service_status.py" ]
+	command = [ PluginContribDir + "/check_cloudera_service_status.py" ]
 
 	arguments = {
 		"-H" = {
@@ -48,7 +48,7 @@ object CheckCommand "cloudera_service_status" {
 }
 
 object CheckCommand "cloudera_hdfs_space" {
-	command = [ PluginDir + "/check_cloudera_hdfs_space.py" ]
+	command = [ PluginContribDir + "/check_cloudera_hdfs_space.py" ]
 
 	arguments = {
 		"-H" = {
@@ -80,7 +80,7 @@ object CheckCommand "cloudera_hdfs_space" {
 }
 
 object CheckCommand "cloudera_hdfs_files" {
-	command = [ PluginDir + "/check_cloudera_hdfs_files.py" ]
+	command = [ PluginContribDir + "/check_cloudera_hdfs_files.py" ]
 
 	arguments = {
 		"-H" = {
diff --git a/itl/plugins-contrib.d/hardware.conf b/itl/plugins-contrib.d/hardware.conf
index 4d7b02e82..c412cb752 100644
--- a/itl/plugins-contrib.d/hardware.conf
+++ b/itl/plugins-contrib.d/hardware.conf
@@ -189,7 +189,7 @@ object CheckCommand "openmanage" {
 }
 
 object CheckCommand "lmsensors" {
-	command = [ PluginDir + "/check_lmsensors" ]
+	command = [ PluginContribDir + "/check_lmsensors" ]
 
 	arguments = {
 		"-w" = {
@@ -215,7 +215,7 @@ object CheckCommand "lmsensors" {
 
 object CheckCommand "hddtemp" {
 	import "plugin-check-command"
-	command = [ PluginDir + "/check_hddtemp" ]
+	command = [ PluginContribDir + "/check_hddtemp" ]
 
 	arguments = {
 		"--server" = {
diff --git a/itl/plugins-contrib.d/network-services.conf b/itl/plugins-contrib.d/network-services.conf
index 4f5847d19..89554e4cc 100644
--- a/itl/plugins-contrib.d/network-services.conf
+++ b/itl/plugins-contrib.d/network-services.conf
@@ -67,7 +67,7 @@ object CheckCommand "rbl" {
 
 object CheckCommand "lsyncd" {
 	import "plugin-check-command"
-	command = [ PluginDir + "/check_lsyncd" ]
+	command = [ PluginContribDir + "/check_lsyncd" ]
 
 	arguments = {
 		"-s" = {
@@ -86,7 +86,7 @@ object CheckCommand "lsyncd" {
 }
 
 object CheckCommand "fail2ban" {
-	command = [ "sudo", PluginDir + "/check_fail2ban" ]
+	command = [ "sudo", PluginContribDir + "/check_fail2ban" ]
 
 	arguments = {
 		"-D" = {
diff --git a/itl/plugins-contrib.d/raid-controller.conf b/itl/plugins-contrib.d/raid-controller.conf
index b587715ae..17fb388e1 100644
--- a/itl/plugins-contrib.d/raid-controller.conf
+++ b/itl/plugins-contrib.d/raid-controller.conf
@@ -6,7 +6,7 @@
 object CheckCommand "adaptec-raid" {
 	import "plugin-check-command"
 
-	command = [ PluginDir + "/check_adaptec_raid" ]
+	command = [ PluginContribDir + "/check_adaptec_raid" ]
 
 	arguments = {
 		"-C" = {
@@ -27,7 +27,7 @@ object CheckCommand "adaptec-raid" {
 object CheckCommand "lsi-raid" {
 	import "plugin-check-command"
 
-	command = [ PluginDir + "/check_lsi_raid" ]
+	command = [ PluginContribDir + "/check_lsi_raid" ]
 
 	arguments = {
 		"-C" = {
diff --git a/itl/plugins-contrib.d/smart-attributes.conf b/itl/plugins-contrib.d/smart-attributes.conf
index e668bd3cc..20eb34584 100644
--- a/itl/plugins-contrib.d/smart-attributes.conf
+++ b/itl/plugins-contrib.d/smart-attributes.conf
@@ -5,7 +5,7 @@
 object CheckCommand "smart-attributes" {
 	import "plugin-check-command"
 
-	command = [ PluginDir + "/check_smart_attributes" ]
+	command = [ PluginContribDir + "/check_smart_attributes" ]
 
 	arguments = {
 		"-dbj" = {
diff --git a/itl/plugins-contrib.d/storage.conf b/itl/plugins-contrib.d/storage.conf
index 440430080..dca080eb0 100644
--- a/itl/plugins-contrib.d/storage.conf
+++ b/itl/plugins-contrib.d/storage.conf
@@ -1,7 +1,7 @@
 /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 object CheckCommand "glusterfs" {
-	command = [ "sudo", PluginDir + "/check_glusterfs" ]
+	command = [ "sudo", PluginContribDir + "/check_glusterfs" ]
 
 	arguments = {
 		"--perfdata" = {
@@ -41,7 +41,7 @@ object CheckCommand "glusterfs" {
 }
 
 object CheckCommand "ceph" {
-	command = [ PluginDir + "/check_ceph.py" ]
+	command = [ PluginContribDir + "/check_ceph.py" ]
 
 	arguments = {
 		"-e" = {
@@ -88,7 +88,7 @@ object CheckCommand "ceph" {
 
 object CheckCommand "btrfs" {
 	import "plugin-check-command"
-	command = [ "sudo", PluginDir + "/check_btrfs" ]
+	command = [ "sudo", PluginContribDir + "/check_btrfs" ]
 
 	arguments = {
 		"--allocated-warning-gib" = {
diff --git a/itl/plugins-contrib.d/web.conf b/itl/plugins-contrib.d/web.conf
index b58261dd6..c7c4d2358 100644
--- a/itl/plugins-contrib.d/web.conf
+++ b/itl/plugins-contrib.d/web.conf
@@ -563,7 +563,7 @@ object CheckCommand "ssl_cert" {
 
 object CheckCommand "varnish" {
 	import "plugin-check-command"
-	command = [ PluginDir + "/check_varnish" ]
+	command = [ PluginContribDir + "/check_varnish" ]
 
 	arguments = {
 		"-n" = {
@@ -587,7 +587,7 @@ object CheckCommand "varnish" {
 
 object CheckCommand "haproxy" {
 	import "plugin-check-command"
-	command = [ PluginDir + "/check_haproxy" ]
+	command = [ PluginContribDir + "/check_haproxy" ]
 
 	arguments = {
 		"--username" = {
@@ -620,7 +620,7 @@ object CheckCommand "haproxy" {
 
 object CheckCommand "haproxy_status" {
 	import "plugin-check-command"
-	command = [ PluginDir + "/check_haproxy_status" ]
+	command = [ PluginContribDir + "/check_haproxy_status" ]
 
 	arguments = {
 		"--defaults" = {
@@ -665,7 +665,7 @@ object CheckCommand "haproxy_status" {
 
 object CheckCommand "phpfpm_status" {
 	import "plugin-check-command"
-	command = [ PluginDir + "/check_phpfpm_status" ]
+	command = [ PluginContribDir + "/check_phpfpm_status" ]
 
 	arguments = {
 		"-H" = {