[icinga-checkins] icinga.org: icinga2/master: Add the possibility for all ...-dc... checkcommands to specify a cluster name

git at icinga.org git at icinga.org
Mon Aug 29 14:28:05 CEST 2016


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

Author: Yannick Charton <tontonitch-pro at yahoo.fr>
Date:   Tue Aug 23 15:56:00 2016 +0200

Add the possibility for all ...-dc... checkcommands to specify a cluster name

fixes #12519

Signed-off-by: Gunnar Beutner <gunnar.beutner at netways.de>

---

 doc/10-icinga-template-library.md |    8 ++++++++
 itl/plugins-contrib.d/vmware.conf |    5 +++++
 2 files changed, 13 insertions(+)

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index 2182f88..adaed0d 100644
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -2690,6 +2690,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
@@ -2722,6 +2723,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
@@ -2744,6 +2746,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
@@ -2771,6 +2774,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
@@ -2798,6 +2802,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
@@ -2825,6 +2830,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
@@ -2851,6 +2857,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
@@ -2873,6 +2880,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_datacenter       | **Required.** Datacenter/vCenter hostname.
+vmware_cluster          | **Optional.** ESX or ESXi clustername.
 vmware_sslport          | **Optional.** SSL port connection. Defaults to "443".
 vmware_ignoreunknown    | **Optional.** Sometimes 3 (unknown) is returned from a component. But the check itself is ok. With this option the plugin will return OK (0) instead of UNKNOWN (3). Defaults to "false".
 vmware_ignorewarning    | **Optional.** Sometimes 2 (warning) is returned from a component. But the check itself is ok (from an operator view). With this option the plugin will return OK (0) instead of WARNING (1). Defaults to "false".
diff --git a/itl/plugins-contrib.d/vmware.conf b/itl/plugins-contrib.d/vmware.conf
index 4e2900e..1890c0d 100644
--- a/itl/plugins-contrib.d/vmware.conf
+++ b/itl/plugins-contrib.d/vmware.conf
@@ -89,6 +89,11 @@ template CheckCommand "vmware-esx-dc" {
 			required = true
 			description = "Datacenter/Vcenter hostname."
 		}
+		"--cluster" = {
+			value = "$vmware_cluster$"
+			required = false
+			description = "ESX or ESXi clustername."
+		}
 		"--sslport" = {
 			value = "$vmware_sslport$"
 			description = "If a SSL port different from 443 is used."



More information about the icinga-checkins mailing list