diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index 8c8264ce7..2182f88b4 100644
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -2902,6 +2902,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -2924,6 +2925,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -2946,6 +2948,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -2970,6 +2973,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -2992,6 +2996,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3014,6 +3019,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3038,6 +3044,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3060,6 +3067,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3084,6 +3092,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3108,6 +3117,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3133,6 +3143,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3157,6 +3168,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3182,6 +3194,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3206,6 +3219,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3230,6 +3244,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3254,6 +3269,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3278,6 +3294,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3302,6 +3319,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3334,6 +3352,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3356,6 +3375,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3380,6 +3400,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3404,6 +3425,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3428,6 +3450,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3452,6 +3475,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3476,6 +3500,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3500,6 +3525,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3524,6 +3550,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3548,6 +3575,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3572,6 +3600,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3596,6 +3625,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3620,6 +3650,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3646,6 +3677,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3672,6 +3704,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3694,6 +3727,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3716,6 +3750,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3742,6 +3777,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3764,6 +3800,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3789,6 +3826,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3814,6 +3852,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3839,6 +3878,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3865,6 +3905,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3891,6 +3932,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3917,6 +3959,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3942,6 +3985,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3968,6 +4012,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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".
@@ -3994,6 +4039,7 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 Name                    | Description
 ------------------------|--------------
 vmware_host             | **Required.** ESX or ESXi hostname.
+vmware_datacenter       | **Optional.** Datacenter/vCenter hostname. In case the check is done through a Datacenter/vCenter host.
 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 caf7647f1..4e2900e28 100644
--- a/itl/plugins-contrib.d/vmware.conf
+++ b/itl/plugins-contrib.d/vmware.conf
@@ -269,6 +269,11 @@ template CheckCommand "vmware-esx-soap-host" {
 			required = true
 			description = "ESX or ESXi hostname."
 		}
+		"--datacenter" = {
+			value = "$vmware_datacenter$"
+			required = false
+			description = "Datacenter/Vcenter hostname."
+		}
 		"--sslport" = {
 			value = "$vmware_sslport$"
 			description = "If a SSL port different from 443 is used."