.........T [ZBXNEXT-7632] updated HPE Primera template

2 files changed, 14 insertions, 83 deletions

diff --git a/templates/san/hpe_primera_http/README.md b/templates/san/hpe_primera_http/README.md
index 1ec43d9364e..cbafe404555 100644
--- a/templates/san/hpe_primera_http/README.md
+++ b/templates/san/hpe_primera_http/README.md
@@ -42,12 +42,8 @@ No specific Zabbix configuration is required.
 |{$HPE.PRIMERA.LLD.FILTER.TASK.NAME.NOT_MATCHES} |<p>Filter to exclude discovered tasks by name.</p> |`.*` |
 |{$HPE.PRIMERA.LLD.FILTER.TASK.TYPE.MATCHES} |<p>Filter of discoverable tasks by type.</p> |`.*` |
 |{$HPE.PRIMERA.LLD.FILTER.TASK.TYPE.NOT_MATCHES} |<p>Filter to exclude discovered tasks by type.</p> |`CHANGE_IF_NEEDED` |
-|{$HPE.PRIMERA.VOLUME.FREE.MIN.CRIT} |<p>This macro is used for trigger expression. It can be overridden on the host or linked on the template level.</p> |`5G` |
-|{$HPE.PRIMERA.VOLUME.FREE.MIN.WARN} |<p>This macro is used for trigger expression. It can be overridden on the host or linked on the template level.</p> |`10G` |
 |{$HPE.PRIMERA.VOLUME.NAME.MATCHES} |<p>This macro is used in filters of volume discovery rule.</p> |`.*` |
 |{$HPE.PRIMERA.VOLUME.NAME.NOT_MATCHES} |<p>This macro is used in filters of volume discovery rule.</p> |`^(admin|.srdata|.mgmtdata)$` |
-|{$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT} |<p>Threshold of used volume space for high severity trigger in %.</p> |`90` |
-|{$HPE.PRIMERA.VOLUME.PUSED.MAX.WARN} |<p>Threshold of used volume space for warning trigger in %.</p> |`80` |
 
 ## Template links
 
@@ -59,7 +55,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Common provisioning groups discovery |<p>List of CPGs resources.</p> |DEPENDENT |hpe.primera.cpg.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$HPE.PRIMERA.CPG.NAME.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$HPE.PRIMERA.CPG.NAME.NOT_MATCHES}`</p> |
 |Disks discovery |<p>List of physical disk resources.</p> |DEPENDENT |hpe.primera.disks.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Hosts discovery |<p>List of host properties.</p> |DEPENDENT |hpe.primera.hosts.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hosts discovery |<p>List of host properties.</p> |DEPENDENT |hpe.primera.hosts.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#NAME} EXISTS</p> |
 |Ports discovery |<p>List of ports.</p> |DEPENDENT |hpe.primera.ports.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#TYPE} NOT_MATCHES_REGEX `3`</p> |
 |Tasks discovery |<p>List of tasks started within last 24 hours.</p> |DEPENDENT |hpe.primera.tasks.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$HPE.PRIMERA.LLD.FILTER.TASK.NAME.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$HPE.PRIMERA.LLD.FILTER.TASK.NAME.NOT_MATCHES}`</p><p>- {#TYPE} MATCHES_REGEX `{$HPE.PRIMERA.LLD.FILTER.TASK.TYPE.MATCHES}`</p><p>- {#TYPE} NOT_MATCHES_REGEX `{$HPE.PRIMERA.LLD.FILTER.TASK.TYPE.NOT_MATCHES}`</p> |
 |Volumes discovery |<p>List of storage volume resources.</p> |DEPENDENT |hpe.primera.volumes.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$HPE.PRIMERA.VOLUME.NAME.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$HPE.PRIMERA.VOLUME.NAME.NOT_MATCHES}`</p> |
@@ -172,7 +168,7 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|HPE Primera: WSAPI is not responding |<p>ID from system information is 0 or unable to retrieve system information.</p> |`last(/HPE Primera by HTTP/hpe.primera.system.health)=0` |HIGH |<p>**Depends on**:</p><p>- HPE Primera: Service is unavailable</p> |
+|HPE Primera: Failed to fetch data from WSAPI |<p>ID from system information is 0 or unable to retrieve system information.</p> |`max(/HPE Primera by HTTP/hpe.primera.system.health,#3)=0` |AVERAGE |<p>**Depends on**:</p><p>- HPE Primera: Service is unavailable</p> |
 |HPE Primera: Service is unavailable |<p>-</p> |`last(/HPE Primera by HTTP/net.tcp.service["{$HPE.PRIMERA.API.SCHEME}","{HOST.CONN}","{$HPE.PRIMERA.API.PORT}"])=0` |HIGH |<p>Manual close: YES</p> |
 |CPG [{#NAME}]: Degraded |<p>CPG [{#NAME}] is in degraded state.</p> |`last(/HPE Primera by HTTP/hpe.primera.cpg.state["{#ID}"])=2` |AVERAGE | |
 |CPG [{#NAME}]: Failed |<p>CPG [{#NAME}] is in failed state.</p> |`last(/HPE Primera by HTTP/hpe.primera.cpg.state["{#ID}"])=3` |HIGH | |
@@ -190,8 +186,6 @@ There are no template links in this template.
 |Task [{#NAME}]: Failed |<p>Task [{#NAME}] is failed.</p> |`last(/HPE Primera by HTTP/hpe.primera.task["{#ID}",status])=4` |AVERAGE | |
 |Volume [{#NAME}]: Degraded |<p>Volume [{#NAME}] is in degraded state.</p> |`last(/HPE Primera by HTTP/hpe.primera.volume.state["{#ID}"])=2` |AVERAGE | |
 |Volume [{#NAME}]: Failed |<p>Volume [{#NAME}] is in failed state.</p> |`last(/HPE Primera by HTTP/hpe.primera.volume.state["{#ID}"])=3` |HIGH | |
-|Volume [{#NAME}]: Space is critically low |<p>Two conditions should match: First, space utilization should be above {$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT:"{#NAME}"}%.</p><p>Second condition: The pool free space is less than {$HPE.PRIMERA.VOLUME.FREE.MIN.CRIT:"{#NAME}"}.</p> |`min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)/last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) > {$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT:"{#NAME}"} and (last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) - min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)) < {$HPE.PRIMERA.VOLUME.FREE.MIN.CRIT:"{#NAME}"}` |HIGH | |
-|Volume [{#NAME}]: Space is low |<p>Two conditions should match: First, space utilization should be above {$HPE.PRIMERA.VOLUME.PUSED.MAX.WARN:"{#NAME}"}%.</p><p>Second condition: The pool free space is less than {$HPE.PRIMERA.VOLUME.FREE.MIN.WARN:"{#NAME}"}.</p> |`min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)/last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) > {$HPE.PRIMERA.VOLUME.PUSED.MAX.WARN:"{#NAME}"} and (last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) - min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)) < {$HPE.PRIMERA.VOLUME.FREE.MIN.WARN:"{#NAME}"}` |WARNING |<p>**Depends on**:</p><p>- Volume [{#NAME}]: Space is critically low</p> |
 
 ## Feedback
 
diff --git a/templates/san/hpe_primera_http/template_san_hpe_primera_http.yaml b/templates/san/hpe_primera_http/template_san_hpe_primera_http.yaml
index 9264da6eb61..831857d09ee 100644
--- a/templates/san/hpe_primera_http/template_san_hpe_primera_http.yaml
+++ b/templates/san/hpe_primera_http/template_san_hpe_primera_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-05-06T14:27:31Z'
+  date: '2022-05-13T10:31:57Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -317,7 +317,7 @@ zabbix_export:
           tags:
             -
               tag: component
-              value: disks
+              value: disk
             -
               tag: component
               value: storage
@@ -721,9 +721,9 @@ zabbix_export:
           triggers:
             -
               uuid: 570d440e7ec9445585003208eca06e63
-              expression: 'last(/HPE Primera by HTTP/hpe.primera.system.health)=0'
-              name: 'HPE Primera: WSAPI is not responding'
-              priority: HIGH
+              expression: 'max(/HPE Primera by HTTP/hpe.primera.system.health,#3)=0'
+              name: 'HPE Primera: Failed to fetch data from WSAPI'
+              priority: AVERAGE
               description: 'ID from system information is 0 or unable to retrieve system information.'
               dependencies:
                 -
@@ -2837,6 +2837,13 @@ zabbix_export:
           key: hpe.primera.hosts.discovery
           delay: '0'
           description: 'List of host properties.'
+          filter:
+            evaltype: AND
+            conditions:
+              - 
+                macro: '{#NAME}'
+                operator: EXISTS
+                formulaid: A
           item_prototypes:
             -
               uuid: 142a03a36dbf477ebbcb99994efe4246
@@ -3078,9 +3085,6 @@ zabbix_export:
                   tag: component
                   value: port
                 -
-                  tag: label
-                  value: '{#LABEL}'
-                -
                   tag: port
                   value: '{#NODE}:{#SLOT}:{#CARD.PORT}'
               trigger_prototypes:
@@ -3133,9 +3137,6 @@ zabbix_export:
                   tag: component
                   value: port
                 -
-                  tag: label
-                  value: '{#LABEL}'
-                -
                   tag: port
                   value: '{#NODE}:{#SLOT}:{#CARD.PORT}'
             -
@@ -3185,9 +3186,6 @@ zabbix_export:
                   tag: component
                   value: port
                 -
-                  tag: label
-                  value: '{#LABEL}'
-                -
                   tag: port
                   value: '{#NODE}:{#SLOT}:{#CARD.PORT}'
               trigger_prototypes:
@@ -3255,9 +3253,6 @@ zabbix_export:
                   tag: component
                   value: port
                 -
-                  tag: label
-                  value: '{#LABEL}'
-                -
                   tag: port
                   value: '{#NODE}:{#SLOT}:{#CARD.PORT}'
           master_item:
@@ -3267,9 +3262,6 @@ zabbix_export:
               lld_macro: '{#CARD.PORT}'
               path: $.portPos.cardPort
             -
-              lld_macro: '{#LABEL}'
-              path: $.label
-            -
               lld_macro: '{#NODE}'
               path: $.portPos.node
             -
@@ -4521,45 +4513,6 @@ zabbix_export:
                 -
                   tag: volume
                   value: '{#NAME}'
-          trigger_prototypes:
-            -
-              uuid: 59226030b2ce4c5e8a3cf31990e6b036
-              expression: 'min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)/last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) > {$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT:"{#NAME}"} and (last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) - min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)) < {$HPE.PRIMERA.VOLUME.FREE.MIN.CRIT:"{#NAME}"}'
-              name: 'Volume [{#NAME}]: Space is critically low'
-              event_name: 'Volume [{#NAME}]: Space is critically low (more than {$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT:"{#NAME}"}% used)'
-              opdata: 'Current usage: {ITEM.LASTVALUE1} of {ITEM.LASTVALUE2}'
-              priority: HIGH
-              description: |
-                Two conditions should match: First, space utilization should be above {$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT:"{#NAME}"}%.
-                Second condition: The pool free space is less than {$HPE.PRIMERA.VOLUME.FREE.MIN.CRIT:"{#NAME}"}.
-              tags:
-                -
-                  tag: scope
-                  value: capacity
-                -
-                  tag: scope
-                  value: performance
-            -
-              uuid: dd1f0c9a629e4fd0b507a0bb95cc40b4
-              expression: 'min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)/last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) > {$HPE.PRIMERA.VOLUME.PUSED.MAX.WARN:"{#NAME}"} and (last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) - min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)) < {$HPE.PRIMERA.VOLUME.FREE.MIN.WARN:"{#NAME}"}'
-              name: 'Volume [{#NAME}]: Space is low'
-              event_name: 'Volume [{#NAME}]: Space is low (more than {$HPE.PRIMERA.VOLUME.PUSED.MAX.WARN:"{#NAME}"}% used)'
-              opdata: 'Current usage: {ITEM.LASTVALUE1} of {ITEM.LASTVALUE2}'
-              priority: WARNING
-              description: |
-                Two conditions should match: First, space utilization should be above {$HPE.PRIMERA.VOLUME.PUSED.MAX.WARN:"{#NAME}"}%.
-                Second condition: The pool free space is less than {$HPE.PRIMERA.VOLUME.FREE.MIN.WARN:"{#NAME}"}.
-              dependencies:
-                -
-                  name: 'Volume [{#NAME}]: Space is critically low'
-                  expression: 'min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)/last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) > {$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT:"{#NAME}"} and (last(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",size]) - min(/HPE Primera by HTTP/hpe.primera.volume.space.total["{#ID}",used],5m)) < {$HPE.PRIMERA.VOLUME.FREE.MIN.CRIT:"{#NAME}"}'
-              tags:
-                -
-                  tag: scope
-                  value: capacity
-                -
-                  tag: scope
-                  value: performance
           graph_prototypes:
             -
               uuid: 8c7139d2b7d94773ad6ef813c7fa59c9
@@ -4748,14 +4701,6 @@ zabbix_export:
           value: CHANGE_IF_NEEDED
           description: 'Filter to exclude discovered tasks by type.'
         -
-          macro: '{$HPE.PRIMERA.VOLUME.FREE.MIN.CRIT}'
-          value: 5G
-          description: 'This macro is used for trigger expression. It can be overridden on the host or linked on the template level.'
-        -
-          macro: '{$HPE.PRIMERA.VOLUME.FREE.MIN.WARN}'
-          value: 10G
-          description: 'This macro is used for trigger expression. It can be overridden on the host or linked on the template level.'
-        -
           macro: '{$HPE.PRIMERA.VOLUME.NAME.MATCHES}'
           value: '.*'
           description: 'This macro is used in filters of volume discovery rule.'
@@ -4763,14 +4708,6 @@ zabbix_export:
           macro: '{$HPE.PRIMERA.VOLUME.NAME.NOT_MATCHES}'
           value: ^(admin|.srdata|.mgmtdata)$
           description: 'This macro is used in filters of volume discovery rule.'
-        -
-          macro: '{$HPE.PRIMERA.VOLUME.PUSED.MAX.CRIT}'
-          value: '90'
-          description: 'Threshold of used volume space for high severity trigger in %.'
-        -
-          macro: '{$HPE.PRIMERA.VOLUME.PUSED.MAX.WARN}'
-          value: '80'
-          description: 'Threshold of used volume space for warning trigger in %.'
       valuemaps:
         -
           uuid: 79ba0611293541f29f8b43b34e64465d