.........T [ZBX-20564] changed health state sensor item to lld in vmware hypervisor template

Merge in ZBX/zabbix from feature/ZBX-20564-5.4 to release/5.4

* commit 'cd61218cfa41e6c625fb28eb6b4e06d9826ecfbc':
  .........T [ZBX-20564] changed health state sensor item to lld in vmware hypervisor template

5 files changed, 173 insertions, 76 deletions

diff --git a/ChangeLog.d/bugfix/ZBX-20564 b/ChangeLog.d/bugfix/ZBX-20564
new file mode 100644
index 00000000000..a422c98ce6d
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20564
@@ -0,0 +1 @@
+.........T [ZBX-20564] changed health state sensor item to lld in vmware hypervisor template (vkhaliev)
diff --git a/templates/app/vmware/README.md b/templates/app/vmware/README.md
index 558f73dd1b5..fbfdbdffa2d 100644
--- a/templates/app/vmware/README.md
+++ b/templates/app/vmware/README.md
@@ -181,6 +181,7 @@ No specific Zabbix configuration is required.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Datastore discovery |<p>-</p> |SIMPLE |vmware.hv.datastore.discovery[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
+|Healthcheck discovery |<p>VMware Rollup Health State sensor discovery</p> |DEPENDENT |vmware.hv.healthcheck.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")]`</p><p>- JAVASCRIPT: `return JSON.stringify(value != "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 
 ## Items collected
 
@@ -207,7 +208,6 @@ No specific Zabbix configuration is required.
 |VMware |VMware: Used memory |<p>Physical memory usage on the host.</p> |SIMPLE |vmware.hv.memory.used[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Number of bytes received |<p>VMware hypervisor network input statistics (bytes per second).</p> |SIMPLE |vmware.hv.network.in[{$VMWARE.URL},{$VMWARE.HV.UUID},bps] |
 |VMware |VMware: Number of bytes transmitted |<p>VMware hypervisor network output statistics (bytes per second).</p> |SIMPLE |vmware.hv.network.out[{$VMWARE.URL},{$VMWARE.HV.UUID},bps] |
-|VMware |VMware: Health state rollup |<p>The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.</p> |SIMPLE |vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Overall status |<p>The overall alarm status of the host: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.</p> |SIMPLE |vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Uptime |<p>System uptime.</p> |SIMPLE |vmware.hv.uptime[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Version |<p>Dot-separated version string.</p> |SIMPLE |vmware.hv.version[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
@@ -217,18 +217,20 @@ No specific Zabbix configuration is required.
 |VMware |VMware: Total size of datastore {#DATASTORE} |<p>VMware datastore space in bytes.</p> |SIMPLE |vmware.hv.datastore.size[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}] |
 |VMware |VMware: Average write latency of the datastore {#DATASTORE} |<p>Average amount of time for a write operation to the datastore (milliseconds).</p> |SIMPLE |vmware.hv.datastore.write[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE},latency] |
 |VMware |VMware: Multipath count for datastore {#DATASTORE} |<p>Number of available datastore paths.</p> |SIMPLE |vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}] |
+|VMware |VMware: Health state rollup |<p>The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.</p> |DEPENDENT |vmware.hv.sensor.health.state[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")].healthState.label.first()`</p> |
+|Zabbix raw items |VMware: Get sensors |<p>Master item for sensors data.</p> |SIMPLE |vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |VMware: Hypervisor is down |<p>The service is unavailable or does not accept ICMP ping.</p> |`last(/VMware Hypervisor/icmpping[])=0` |AVERAGE |<p>Manual close: YES</p> |
-|VMware: The {$VMWARE.HV.UUID} health is Red |<p>One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3` |HIGH |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p> |
-|VMware: The {$VMWARE.HV.UUID} health is Yellow |<p>One or more components in the appliance might become overloaded soon.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2` |AVERAGE |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Yellow</p> |
 |VMware: The {$VMWARE.HV.UUID} health is Red |<p>One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.</p> |`last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3` |HIGH | |
 |VMware: The {$VMWARE.HV.UUID} health is Yellow |<p>One or more components in the appliance might become overloaded soon.</p> |`last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2` |AVERAGE |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p> |
 |VMware: Hypervisor has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/VMware Hypervisor/vmware.hv.uptime[{$VMWARE.URL},{$VMWARE.HV.UUID}])<10m` |WARNING |<p>Manual close: YES</p> |
 |VMware: The multipath count has been changed |<p>The number of available datastore paths less than registered ({#MULTIPATH.COUNT}).</p> |`last(/VMware Hypervisor/vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}],#1)<>last(/VMware Hypervisor/vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}],#2) and last(/VMware Hypervisor/vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}])<{#MULTIPATH.COUNT}` |AVERAGE |<p>Manual close: YES</p> |
+|VMware: The {$VMWARE.HV.UUID} health is Red |<p>One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Red"` |HIGH |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p> |
+|VMware: The {$VMWARE.HV.UUID} health is Yellow |<p>One or more components in the appliance might become overloaded soon.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Yellow"` |AVERAGE |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Yellow</p> |
 
 ## Feedback
 
diff --git a/templates/app/vmware/template_app_vmware.yaml b/templates/app/vmware/template_app_vmware.yaml
index 9f473e184e2..161202c7065 100644
--- a/templates/app/vmware/template_app_vmware.yaml
+++ b/templates/app/vmware/template_app_vmware.yaml
@@ -1350,47 +1350,20 @@ zabbix_export:
               tag: Application
               value: VMware
         -
-          uuid: 36b28fccf6db4c49bf20157c419400d0
-          name: 'VMware: Health state rollup'
+          uuid: 3c9d6ffb53624758ad888bf70f69218c
+          name: 'VMware: Get sensors'
           type: SIMPLE
-          key: 'vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
-          history: 7d
+          key: 'vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
+          history: '0'
+          trends: '0'
+          value_type: TEXT
           username: '{$VMWARE.USERNAME}'
           password: '{$VMWARE.PASSWORD}'
-          description: 'The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.'
-          valuemap:
-            name: 'VMware status'
+          description: 'Master item for sensors data.'
           tags:
             -
               tag: Application
-              value: VMware
-          triggers:
-            -
-              uuid: ffb8e14b1ea546b69f40070c628ac653
-              expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-              name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-              priority: HIGH
-              description: 'One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.'
-              dependencies:
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-            -
-              uuid: 4825f11dcbf74e2c8e7e2b251cbeb7d9
-              expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
-              name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
-              priority: AVERAGE
-              description: 'One or more components in the appliance might become overloaded soon.'
-              dependencies:
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
+              value: 'Zabbix raw items'
         -
           uuid: 0cec294521314c5482233b5b96e90c8d
           name: 'VMware: Overall status'
@@ -1564,6 +1537,79 @@ zabbix_export:
                 -
                   tag: Application
                   value: VMware
+        -
+          uuid: deb31adf69634837839e2d8f87167f28
+          name: 'Healthcheck discovery'
+          type: DEPENDENT
+          key: vmware.hv.healthcheck.discovery
+          delay: '0'
+          description: 'VMware Rollup Health State sensor discovery'
+          item_prototypes:
+            -
+              uuid: fabb7524dd454daa942266e5565ce40e
+              name: 'VMware: Health state rollup'
+              type: DEPENDENT
+              key: 'vmware.hv.sensor.health.state[{#SINGLETON}]'
+              delay: '0'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: 'The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")].healthState.label.first()'
+              master_item:
+                key: 'vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
+              tags:
+                -
+                  tag: Application
+                  value: VMware
+              trigger_prototypes:
+                -
+                  uuid: 9f2a65161946436986aacf6c9a637673
+                  expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Red"'
+                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                  priority: HIGH
+                  description: 'One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.'
+                  dependencies:
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+                -
+                  uuid: dc4f84eb8d2143bb80999fbc58f38928
+                  expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Yellow"'
+                  name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
+                  priority: AVERAGE
+                  description: 'One or more components in the appliance might become overloaded soon.'
+                  dependencies:
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Red"'
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
+          master_item:
+            key: 'vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")]'
+              error_handler: CUSTOM_VALUE
+              error_handler_params: '[]'
+            -
+              type: JAVASCRIPT
+              parameters:
+                - 'return JSON.stringify(value != "[]" ? [{''{#SINGLETON}'': ''''}] : []);'
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 6h
       valuemaps:
         -
           uuid: 25d04e2838af4fcca9ddd21df6781497
diff --git a/templates/app/vmware_fqdn/README.md b/templates/app/vmware_fqdn/README.md
index 3537b67b379..1d104a0d3ee 100644
--- a/templates/app/vmware_fqdn/README.md
+++ b/templates/app/vmware_fqdn/README.md
@@ -181,6 +181,7 @@ No specific Zabbix configuration is required.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Datastore discovery |<p>-</p> |SIMPLE |vmware.hv.datastore.discovery[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
+|Healthcheck discovery |<p>VMware Rollup Health State sensor discovery</p> |DEPENDENT |vmware.hv.healthcheck.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")]`</p><p>- JAVASCRIPT: `return JSON.stringify(value != "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 
 ## Items collected
 
@@ -207,7 +208,6 @@ No specific Zabbix configuration is required.
 |VMware |VMware: Used memory |<p>Physical memory usage on the host.</p> |SIMPLE |vmware.hv.memory.used[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Number of bytes received |<p>VMware hypervisor network input statistics (bytes per second).</p> |SIMPLE |vmware.hv.network.in[{$VMWARE.URL},{$VMWARE.HV.UUID},bps] |
 |VMware |VMware: Number of bytes transmitted |<p>VMware hypervisor network output statistics (bytes per second).</p> |SIMPLE |vmware.hv.network.out[{$VMWARE.URL},{$VMWARE.HV.UUID},bps] |
-|VMware |VMware: Health state rollup |<p>The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.</p> |SIMPLE |vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Overall status |<p>The overall alarm status of the host: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.</p> |SIMPLE |vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Uptime |<p>System uptime.</p> |SIMPLE |vmware.hv.uptime[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 |VMware |VMware: Version |<p>Dot-separated version string.</p> |SIMPLE |vmware.hv.version[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
@@ -217,18 +217,20 @@ No specific Zabbix configuration is required.
 |VMware |VMware: Total size of datastore {#DATASTORE} |<p>VMware datastore space in bytes.</p> |SIMPLE |vmware.hv.datastore.size[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}] |
 |VMware |VMware: Average write latency of the datastore {#DATASTORE} |<p>Average amount of time for a write operation to the datastore (milliseconds).</p> |SIMPLE |vmware.hv.datastore.write[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE},latency] |
 |VMware |VMware: Multipath count for datastore {#DATASTORE} |<p>Number of available datastore paths.</p> |SIMPLE |vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}] |
+|VMware |VMware: Health state rollup |<p>The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.</p> |DEPENDENT |vmware.hv.sensor.health.state[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")].healthState.label.first()`</p> |
+|Zabbix raw items |VMware: Get sensors |<p>Master item for sensors data.</p> |SIMPLE |vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}] |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |VMware: Hypervisor is down |<p>The service is unavailable or does not accept ICMP ping.</p> |`last(/VMware Hypervisor/icmpping[])=0` |AVERAGE |<p>Manual close: YES</p> |
-|VMware: The {$VMWARE.HV.UUID} health is Red |<p>One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3` |HIGH |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p> |
-|VMware: The {$VMWARE.HV.UUID} health is Yellow |<p>One or more components in the appliance might become overloaded soon.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2` |AVERAGE |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Yellow</p> |
 |VMware: The {$VMWARE.HV.UUID} health is Red |<p>One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.</p> |`last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3` |HIGH | |
 |VMware: The {$VMWARE.HV.UUID} health is Yellow |<p>One or more components in the appliance might become overloaded soon.</p> |`last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2` |AVERAGE |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p> |
 |VMware: Hypervisor has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/VMware Hypervisor/vmware.hv.uptime[{$VMWARE.URL},{$VMWARE.HV.UUID}])<10m` |WARNING |<p>Manual close: YES</p> |
 |VMware: The multipath count has been changed |<p>The number of available datastore paths less than registered ({#MULTIPATH.COUNT}).</p> |`last(/VMware Hypervisor/vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}],#1)<>last(/VMware Hypervisor/vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}],#2) and last(/VMware Hypervisor/vmware.hv.datastore.multipath[{$VMWARE.URL},{$VMWARE.HV.UUID},{#DATASTORE}])<{#MULTIPATH.COUNT}` |AVERAGE |<p>Manual close: YES</p> |
+|VMware: The {$VMWARE.HV.UUID} health is Red |<p>One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Red"` |HIGH |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p> |
+|VMware: The {$VMWARE.HV.UUID} health is Yellow |<p>One or more components in the appliance might become overloaded soon.</p> |`last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Yellow"` |AVERAGE |<p>**Depends on**:</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Red</p><p>- VMware: The {$VMWARE.HV.UUID} health is Yellow</p> |
 
 ## Feedback
 
diff --git a/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml b/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml
index a0ad38d42ff..be43f97003c 100644
--- a/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml
+++ b/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml
@@ -1358,47 +1358,20 @@ zabbix_export:
               tag: Application
               value: VMware
         -
-          uuid: 36b28fccf6db4c49bf20157c419400d0
-          name: 'VMware: Health state rollup'
+          uuid: 3c9d6ffb53624758ad888bf70f69218c
+          name: 'VMware: Get sensors'
           type: SIMPLE
-          key: 'vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
-          history: 7d
+          key: 'vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
+          history: '0'
+          trends: '0'
+          value_type: TEXT
           username: '{$VMWARE.USERNAME}'
           password: '{$VMWARE.PASSWORD}'
-          description: 'The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.'
-          valuemap:
-            name: 'VMware status'
+          description: 'Master item for sensors data.'
           tags:
             -
               tag: Application
-              value: VMware
-          triggers:
-            -
-              uuid: ffb8e14b1ea546b69f40070c628ac653
-              expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-              name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-              priority: HIGH
-              description: 'One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.'
-              dependencies:
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-            -
-              uuid: 4825f11dcbf74e2c8e7e2b251cbeb7d9
-              expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
-              name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
-              priority: AVERAGE
-              description: 'One or more components in the appliance might become overloaded soon.'
-              dependencies:
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
-                -
-                  name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
-                  expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
+              value: 'Zabbix raw items'
         -
           uuid: 0cec294521314c5482233b5b96e90c8d
           name: 'VMware: Overall status'
@@ -1572,6 +1545,79 @@ zabbix_export:
                 -
                   tag: Application
                   value: VMware
+        -
+          uuid: deb31adf69634837839e2d8f87167f28
+          name: 'Healthcheck discovery'
+          type: DEPENDENT
+          key: vmware.hv.healthcheck.discovery
+          delay: '0'
+          description: 'VMware Rollup Health State sensor discovery'
+          item_prototypes:
+            -
+              uuid: fabb7524dd454daa942266e5565ce40e
+              name: 'VMware: Health state rollup'
+              type: DEPENDENT
+              key: 'vmware.hv.sensor.health.state[{#SINGLETON}]'
+              delay: '0'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: 'The host health state rollup sensor value: gray - unknown, green - ok, red - it has a problem, yellow - it might have a problem.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")].healthState.label.first()'
+              master_item:
+                key: 'vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
+              tags:
+                -
+                  tag: Application
+                  value: VMware
+              trigger_prototypes:
+                -
+                  uuid: 9f2a65161946436986aacf6c9a637673
+                  expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Red"'
+                  name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                  priority: HIGH
+                  description: 'One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.'
+                  dependencies:
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+                -
+                  uuid: dc4f84eb8d2143bb80999fbc58f38928
+                  expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Yellow"'
+                  name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
+                  priority: AVERAGE
+                  description: 'One or more components in the appliance might become overloaded soon.'
+                  dependencies:
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{#SINGLETON}])="Red"'
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+                    -
+                      name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
+                      expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
+          master_item:
+            key: 'vmware.hv.sensors.get[{$VMWARE.URL},{$VMWARE.HV.UUID}]'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$..HostNumericSensorInfo[?(@.name=="VMware Rollup Health State")]'
+              error_handler: CUSTOM_VALUE
+              error_handler_params: '[]'
+            -
+              type: JAVASCRIPT
+              parameters:
+                - 'return JSON.stringify(value != "[]" ? [{''{#SINGLETON}'': ''''}] : []);'
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 6h
       valuemaps:
         -
           uuid: 25d04e2838af4fcca9ddd21df6781497