.........T [ZBXNEXT-7630] updated HPE MSA templates

4 files changed, 222 insertions, 217 deletions

diff --git a/templates/san/hpe_msa2040_http/README.md b/templates/san/hpe_msa2040_http/README.md
index 787a4b12c9a..f89436e4911 100644
--- a/templates/san/hpe_msa2040_http/README.md
+++ b/templates/san/hpe_msa2040_http/README.md
@@ -160,7 +160,7 @@ There are no template links in this template.
 |HPE |FRU [{#ENCLOSURE.ID}: {#LOCATION}]: Status |<p>{#DESCRIPTION}. FRU status:</p><p>Absent: Component is not present.</p><p>Fault: At least one subcomponent has a fault.</p><p>Invalid data: For a power supply module, the EEPROM is improperly programmed.</p><p>OK: All subcomponents are operating normally.</p><p>Not available: Status is not available.</p> |DEPENDENT |hpe.msa.frus["{#ENCLOSURE.ID}:{#LOCATION}",status]<p>**Preprocessing**:</p><p>- JSONPATH: `$.['frus'][?(@['name'] == "{#TYPE}" && @['fru-location'] == "{#LOCATION}")].['fru-status'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |HPE |FRU [{#ENCLOSURE.ID}: {#LOCATION}]: Part number |<p>{#DESCRIPTION}. Part number of the FRU.</p> |DEPENDENT |hpe.msa.frus["{#ENCLOSURE.ID}:{#LOCATION}",part_number]<p>**Preprocessing**:</p><p>- JSONPATH: `$.['frus'][?(@['name'] == "{#TYPE}" && @['fru-location'] == "{#LOCATION}")].['part-number'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |HPE |FRU [{#ENCLOSURE.ID}: {#LOCATION}]: Serial number |<p>{#DESCRIPTION}. FRU serial number.</p> |DEPENDENT |hpe.msa.frus["{#ENCLOSURE.ID}:{#LOCATION}",serial_number]<p>**Preprocessing**:</p><p>- JSONPATH: `$.['frus'][?(@['name'] == "{#TYPE}" && @['fru-location'] == "{#LOCATION}")].['serial-number'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Zabbix raw items |HPE MSA: Get data |<p>The JSON with result of API requests.</p> |SCRIPT |hpe.msa.raw.data<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |HPE MSA: Get data |<p>The JSON with result of API requests.</p> |SCRIPT |hpe.msa.data.get<p>**Expression**:</p>`The text is too long. Please see the template.` |
 
 ## Triggers
 
diff --git a/templates/san/hpe_msa2040_http/template_san_hpe_msa2040_http.yaml b/templates/san/hpe_msa2040_http/template_san_hpe_msa2040_http.yaml
index f5525d69204..b7c5169cf1c 100644
--- a/templates/san/hpe_msa2040_http/template_san_hpe_msa2040_http.yaml
+++ b/templates/san/hpe_msa2040_http/template_san_hpe_msa2040_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-05-30T08:10:32Z'
+  date: '2022-05-31T09:41:36Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -33,7 +33,7 @@ zabbix_export:
           type: DEPENDENT
           key: hpe.msa.data.errors
           delay: '0'
-          history: 1h
+          history: 7d
           trends: '0'
           value_type: TEXT
           description: 'A list of method errors from API requests.'
@@ -47,7 +47,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -71,7 +71,7 @@ zabbix_export:
           uuid: e07e09dbcdd44f509a06343c9a53a455
           name: 'HPE MSA: Get data'
           type: SCRIPT
-          key: hpe.msa.raw.data
+          key: hpe.msa.data.get
           history: '0'
           trends: '0'
           value_type: TEXT
@@ -227,7 +227,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -250,7 +250,7 @@ zabbix_export:
               error_handler: CUSTOM_VALUE
               error_handler_params: '4'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -310,7 +310,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -336,7 +336,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -362,7 +362,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -388,7 +388,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -414,7 +414,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -476,7 +476,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -502,7 +502,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -528,7 +528,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -554,7 +554,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -577,7 +577,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''write-cache-used''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -608,7 +608,7 @@ zabbix_export:
                   parameters:
                     - '1048576'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -631,7 +631,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''cpu-load''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -671,7 +671,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -694,7 +694,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''bytes-per-second-numeric''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -722,7 +722,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -750,7 +750,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -773,7 +773,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''iops''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -801,7 +801,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -827,7 +827,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -853,7 +853,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -881,7 +881,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -911,7 +911,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -985,7 +985,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1013,7 +1013,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1039,7 +1039,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1067,7 +1067,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1095,7 +1095,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1132,7 +1132,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''power-on-time''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1229,7 +1229,7 @@ zabbix_export:
                     host: 'HPE MSA 2040 Storage by HTTP'
                     key: 'hpe.msa.controllers.iops.write["{#CONTROLLER.ID}",rate]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#CONTROLLER.ID}'
@@ -1278,7 +1278,7 @@ zabbix_export:
                   parameters:
                     - '512'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1306,7 +1306,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1335,7 +1335,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1365,7 +1365,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1427,7 +1427,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1456,7 +1456,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1484,7 +1484,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1512,7 +1512,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1548,7 +1548,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1614,7 +1614,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1642,7 +1642,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1651,7 +1651,7 @@ zabbix_export:
                   tag: disk
                   value: '{#DURABLE.ID}'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -1714,7 +1714,7 @@ zabbix_export:
                   parameters:
                     - '0.000001'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1742,7 +1742,7 @@ zabbix_export:
                   parameters:
                     - '0.000001'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1770,7 +1770,7 @@ zabbix_export:
                   parameters:
                     - '0.000001'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1798,7 +1798,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1821,7 +1821,7 @@ zabbix_export:
                   parameters:
                     - '$.[''disk-group-statistics''][?(@[''name''] == "{#NAME}")].[''bytes-per-second-numeric''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1849,7 +1849,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1877,7 +1877,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1900,7 +1900,7 @@ zabbix_export:
                   parameters:
                     - '$.[''disk-group-statistics''][?(@[''name''] == "{#NAME}")].[''iops''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1928,7 +1928,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1956,7 +1956,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1987,7 +1987,7 @@ zabbix_export:
                   parameters:
                     - '512'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2014,7 +2014,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2045,7 +2045,7 @@ zabbix_export:
                   parameters:
                     - '512'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2121,7 +2121,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2151,7 +2151,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2228,7 +2228,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2402,7 +2402,7 @@ zabbix_export:
                     host: 'HPE MSA 2040 Storage by HTTP'
                     key: 'hpe.msa.disks.groups.space["{#NAME}",total]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'
@@ -2447,7 +2447,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2509,7 +2509,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2537,7 +2537,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2565,7 +2565,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2589,7 +2589,7 @@ zabbix_export:
                   parameters:
                     - '$.[''enclosures''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''enclosure-power''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2619,7 +2619,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2682,7 +2682,7 @@ zabbix_export:
                       tag: scope
                       value: availability
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -2727,7 +2727,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2784,7 +2784,7 @@ zabbix_export:
                   parameters:
                     - '$.[''fans''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''speed''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2812,7 +2812,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2865,7 +2865,7 @@ zabbix_export:
                     host: 'HPE MSA 2040 Storage by HTTP'
                     key: 'hpe.msa.fans["{#DURABLE.ID}",speed]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -2890,12 +2890,17 @@ zabbix_export:
           key: hpe.msa.frus.discovery
           delay: '0'
           filter:
+            evaltype: AND
             conditions:
               -
                 macro: '{#TYPE}'
                 value: ^(POWER_SUPPLY|RAID_IOM|CHASSIS_MIDPLANE)$
                 operator: NOT_MATCHES_REGEX
                 formulaid: A
+              -
+                macro: '{#TYPE}'
+                operator: EXISTS
+                formulaid: B
           description: 'Discover FRU.'
           item_prototypes:
             -
@@ -2918,7 +2923,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2946,7 +2951,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3001,7 +3006,7 @@ zabbix_export:
                       }
                       return 6;
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3034,7 +3039,7 @@ zabbix_export:
                       tag: scope
                       value: availability
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DESCRIPTION}'
@@ -3088,7 +3093,7 @@ zabbix_export:
                   parameters:
                     - '512'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3119,7 +3124,7 @@ zabbix_export:
                   parameters:
                     - '512'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3198,7 +3203,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3257,7 +3262,7 @@ zabbix_export:
                     host: 'HPE MSA 2040 Storage by HTTP'
                     key: 'hpe.msa.pools.space["{#NAME}",total]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'
@@ -3302,7 +3307,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3366,7 +3371,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3428,7 +3433,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3437,7 +3442,7 @@ zabbix_export:
                   tag: port
                   value: '{#NAME}'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'
@@ -3482,7 +3487,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3544,7 +3549,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3572,7 +3577,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3602,7 +3607,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3663,7 +3668,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3682,7 +3687,7 @@ zabbix_export:
                     host: 'HPE MSA 2040 Storage by HTTP'
                     key: 'hpe.msa.power_supplies["{#DURABLE.ID}",temperature]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -3723,7 +3728,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3749,7 +3754,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3775,7 +3780,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3801,7 +3806,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3829,7 +3834,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3852,7 +3857,7 @@ zabbix_export:
                   parameters:
                     - '$.[''volume-statistics''][?(@[''volume-name''] == "{#NAME}")].[''bytes-per-second-numeric''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3880,7 +3885,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3908,7 +3913,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3931,7 +3936,7 @@ zabbix_export:
                   parameters:
                     - '$.[''volume-statistics''][?(@[''volume-name''] == "{#NAME}")].[''iops''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3959,7 +3964,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3990,7 +3995,7 @@ zabbix_export:
                   parameters:
                     - '512'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4021,7 +4026,7 @@ zabbix_export:
                   parameters:
                     - '512'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4103,7 +4108,7 @@ zabbix_export:
                     host: 'HPE MSA 2040 Storage by HTTP'
                     key: 'hpe.msa.volumes.space["{#NAME}",total]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'
diff --git a/templates/san/hpe_msa2060_http/README.md b/templates/san/hpe_msa2060_http/README.md
index 1d3b882b534..a553c46c294 100644
--- a/templates/san/hpe_msa2060_http/README.md
+++ b/templates/san/hpe_msa2060_http/README.md
@@ -170,7 +170,7 @@ There are no template links in this template.
 |HPE |FRU [{#ENCLOSURE.ID}: {#LOCATION}]: Status |<p>{#DESCRIPTION}. FRU status:</p><p>Absent: The FRU is not present.</p><p>Fault: The FRU's health is Degraded or Fault.</p><p>Invalid data: The FRU ID data is invalid. The FRU's EEPROM is improperly programmed.</p><p>OK: The FRU is operating normally.</p><p>Power off: The FRU is powered off.</p> |DEPENDENT |hpe.msa.frus["{#ENCLOSURE.ID}:{#LOCATION}",status]<p>**Preprocessing**:</p><p>- JSONPATH: `$.['frus'][?(@['name'] == "{#TYPE}" && @['fru-location'] == "{#LOCATION}")].['fru-status-numeric'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HPE |FRU [{#ENCLOSURE.ID}: {#LOCATION}]: Part number |<p>{#DESCRIPTION}. Part number of the FRU.</p> |DEPENDENT |hpe.msa.frus["{#ENCLOSURE.ID}:{#LOCATION}",part_number]<p>**Preprocessing**:</p><p>- JSONPATH: `$.['frus'][?(@['name'] == "{#TYPE}" && @['fru-location'] == "{#LOCATION}")].['part-number'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |HPE |FRU [{#ENCLOSURE.ID}: {#LOCATION}]: Serial number |<p>{#DESCRIPTION}. FRU serial number.</p> |DEPENDENT |hpe.msa.frus["{#ENCLOSURE.ID}:{#LOCATION}",serial_number]<p>**Preprocessing**:</p><p>- JSONPATH: `$.['frus'][?(@['name'] == "{#TYPE}" && @['fru-location'] == "{#LOCATION}")].['serial-number'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Zabbix raw items |HPE MSA: Get data |<p>The JSON with result of API requests.</p> |SCRIPT |hpe.msa.raw.data<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |HPE MSA: Get data |<p>The JSON with result of API requests.</p> |SCRIPT |hpe.msa.data.get<p>**Expression**:</p>`The text is too long. Please see the template.` |
 
 ## Triggers
 
diff --git a/templates/san/hpe_msa2060_http/template_san_hpe_msa2060_http.yaml b/templates/san/hpe_msa2060_http/template_san_hpe_msa2060_http.yaml
index 035125096a2..7c43b6c66eb 100644
--- a/templates/san/hpe_msa2060_http/template_san_hpe_msa2060_http.yaml
+++ b/templates/san/hpe_msa2060_http/template_san_hpe_msa2060_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-05-30T08:10:40Z'
+  date: '2022-05-31T09:41:39Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -33,7 +33,7 @@ zabbix_export:
           type: DEPENDENT
           key: hpe.msa.data.errors
           delay: '0'
-          history: 1h
+          history: 7d
           trends: '0'
           value_type: TEXT
           description: 'A list of method errors from API requests.'
@@ -47,7 +47,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -71,7 +71,7 @@ zabbix_export:
           uuid: bafec666b170480f941fe25cb3cf903d
           name: 'HPE MSA: Get data'
           type: SCRIPT
-          key: hpe.msa.raw.data
+          key: hpe.msa.data.get
           history: '0'
           trends: '0'
           value_type: TEXT
@@ -218,7 +218,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -241,7 +241,7 @@ zabbix_export:
               error_handler: CUSTOM_VALUE
               error_handler_params: '4'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -301,7 +301,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -327,7 +327,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -353,7 +353,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -379,7 +379,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -405,7 +405,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           tags:
             -
               tag: component
@@ -467,7 +467,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -493,7 +493,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -519,7 +519,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -545,7 +545,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -568,7 +568,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''write-cache-used''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -599,7 +599,7 @@ zabbix_export:
                   parameters:
                     - '1048576'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -622,7 +622,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''cpu-load''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -662,7 +662,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -685,7 +685,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''bytes-per-second-numeric''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -713,7 +713,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -741,7 +741,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -764,7 +764,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''iops''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -792,7 +792,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -818,7 +818,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -844,7 +844,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -872,7 +872,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -902,7 +902,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -976,7 +976,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1004,7 +1004,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1030,7 +1030,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1058,7 +1058,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1086,7 +1086,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1123,7 +1123,7 @@ zabbix_export:
                   parameters:
                     - '$.[''controller-statistics''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''power-on-time''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1220,7 +1220,7 @@ zabbix_export:
                     host: 'HPE MSA 2060 Storage by HTTP'
                     key: 'hpe.msa.controllers.iops.write["{#CONTROLLER.ID}",rate]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#CONTROLLER.ID}'
@@ -1265,7 +1265,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1291,7 +1291,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1341,7 +1341,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1370,7 +1370,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1400,7 +1400,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1462,7 +1462,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1491,7 +1491,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1519,7 +1519,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1547,7 +1547,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1583,7 +1583,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1649,7 +1649,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1677,7 +1677,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1686,7 +1686,7 @@ zabbix_export:
                   tag: disk
                   value: '{#DURABLE.ID}'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -1749,7 +1749,7 @@ zabbix_export:
                   parameters:
                     - '0.000001'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1777,7 +1777,7 @@ zabbix_export:
                   parameters:
                     - '0.000001'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1805,7 +1805,7 @@ zabbix_export:
                   parameters:
                     - '0.000001'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1831,7 +1831,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1858,7 +1858,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1884,7 +1884,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1912,7 +1912,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1935,7 +1935,7 @@ zabbix_export:
                   parameters:
                     - '$.[''disk-group-statistics''][?(@[''name''] == "{#NAME}")].[''bytes-per-second-numeric''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1963,7 +1963,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -1991,7 +1991,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2014,7 +2014,7 @@ zabbix_export:
                   parameters:
                     - '$.[''disk-group-statistics''][?(@[''name''] == "{#NAME}")].[''iops''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2042,7 +2042,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2070,7 +2070,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2118,7 +2118,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2215,7 +2215,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2245,7 +2245,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2322,7 +2322,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2496,7 +2496,7 @@ zabbix_export:
                     host: 'HPE MSA 2060 Storage by HTTP'
                     key: 'hpe.msa.disks.groups.space["{#NAME}",total]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'
@@ -2541,7 +2541,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2603,7 +2603,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2631,7 +2631,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2659,7 +2659,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2683,7 +2683,7 @@ zabbix_export:
                   parameters:
                     - '$.[''enclosures''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''enclosure-power''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2713,7 +2713,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2776,7 +2776,7 @@ zabbix_export:
                       tag: scope
                       value: availability
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -2821,7 +2821,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2878,7 +2878,7 @@ zabbix_export:
                   parameters:
                     - '$.[''fans''][?(@[''durable-id''] == "{#DURABLE.ID}")].[''speed''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2906,7 +2906,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -2959,7 +2959,7 @@ zabbix_export:
                     host: 'HPE MSA 2060 Storage by HTTP'
                     key: 'hpe.msa.fans["{#DURABLE.ID}",speed]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -3009,7 +3009,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3037,7 +3037,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3072,7 +3072,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3105,7 +3105,7 @@ zabbix_export:
                       tag: scope
                       value: availability
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DESCRIPTION}'
@@ -3155,7 +3155,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3182,7 +3182,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3208,7 +3208,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3329,7 +3329,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3388,7 +3388,7 @@ zabbix_export:
                     host: 'HPE MSA 2060 Storage by HTTP'
                     key: 'hpe.msa.pools.space["{#NAME}",total]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'
@@ -3433,7 +3433,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3497,7 +3497,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3559,7 +3559,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3568,7 +3568,7 @@ zabbix_export:
                   tag: port
                   value: '{#NAME}'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'
@@ -3613,7 +3613,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3675,7 +3675,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3703,7 +3703,7 @@ zabbix_export:
                   parameters:
                     - 1d
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3733,7 +3733,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3776,7 +3776,7 @@ zabbix_export:
                       tag: scope
                       value: performance
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#DURABLE.ID}'
@@ -3817,7 +3817,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3844,7 +3844,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3870,7 +3870,7 @@ zabbix_export:
                   parameters:
                     - 1h
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3896,7 +3896,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3922,7 +3922,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3948,7 +3948,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -3974,7 +3974,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4002,7 +4002,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4025,7 +4025,7 @@ zabbix_export:
                   parameters:
                     - '$.[''volume-statistics''][?(@[''volume-name''] == "{#NAME}")].[''bytes-per-second-numeric''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4053,7 +4053,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4081,7 +4081,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4104,7 +4104,7 @@ zabbix_export:
                   parameters:
                     - '$.[''volume-statistics''][?(@[''volume-name''] == "{#NAME}")].[''iops''].first()'
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4132,7 +4132,7 @@ zabbix_export:
                   parameters:
                     - ''
               master_item:
-                key: hpe.msa.raw.data
+                key: hpe.msa.data.get
               tags:
                 -
                   tag: component
@@ -4256,7 +4256,7 @@ zabbix_export:
                     host: 'HPE MSA 2060 Storage by HTTP'
                     key: 'hpe.msa.volumes.space["{#NAME}",total]'
           master_item:
-            key: hpe.msa.raw.data
+            key: hpe.msa.data.get
           lld_macro_paths:
             -
               lld_macro: '{#NAME}'