.........T [ZBX-15984] added hardware uptime in SNMP templates

1 files changed, 70 insertions, 41 deletions

diff --git a/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml b/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml
index 03db85aa7ca..6459fe70634 100644
--- a/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml
+++ b/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.2'
-  date: '2022-06-07T19:37:14Z'
+  date: '2022-08-16T11:06:33Z'
   template_groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -17,12 +17,13 @@ zabbix_export:
         ENTITY-MIBdescription has changed
         IF-MIB
         MY-PROCESS-MIB
+        HOST-RESOURCES-MIB
         SNMPv2-MIB
         MY-MEMORY-MIB
         ENTITY-MIB
         MY-SYSTEM-MIB
         
-        Template tooling version used: 0.41
+        Template tooling version used: 0.42
       groups:
         -
           name: 'Templates/Network devices'
@@ -271,6 +272,34 @@ zabbix_export:
               tag: component
               value: system
         -
+          uuid: 68631d04f4a94b83901bad116fe68198
+          name: 'Uptime (hardware)'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.1.1.0
+          key: 'system.hw.uptime[hrSystemUptime.0]'
+          delay: 30s
+          history: 2w
+          trends: 0d
+          units: uptime
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of time since this host was last initialized. Note that this is different from sysUpTime in the SNMPv2-MIB [RFC1907] because sysUpTime is the uptime of the network management portion of the system.
+          preprocessing:
+            -
+              type: CHECK_NOT_SUPPORTED
+              parameters:
+                - ''
+              error_handler: CUSTOM_VALUE
+              error_handler_params: '0'
+            -
+              type: MULTIPLIER
+              parameters:
+                - '0.01'
+          tags:
+            -
+              tag: component
+              value: system
+        -
           uuid: fd86860f9ebc42b1970a845b7940daed
           name: 'Hardware version(revision)'
           type: SNMP_AGENT
@@ -353,6 +382,28 @@ zabbix_export:
                   tag: scope
                   value: security
         -
+          uuid: fb250daeb7e643f4b2f78ede9e26b8ec
+          name: 'Uptime (network)'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.3.0
+          key: 'system.net.uptime[sysUpTime.0]'
+          delay: 30s
+          history: 2w
+          trends: 0d
+          units: uptime
+          description: |
+            MIB: SNMPv2-MIB
+            The time (in hundredths of a second) since the network management portion of the system was last re-initialized.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '0.01'
+          tags:
+            -
+              tag: component
+              value: system
+        -
           uuid: f50184058d4549a1be9bae19c0743a84
           name: 'System object ID'
           type: SNMP_AGENT
@@ -412,45 +463,6 @@ zabbix_export:
                   tag: scope
                   value: notice
         -
-          uuid: fb250daeb7e643f4b2f78ede9e26b8ec
-          name: Uptime
-          type: SNMP_AGENT
-          snmp_oid: 1.3.6.1.2.1.1.3.0
-          key: 'system.uptime[sysUpTime.0]'
-          delay: 30s
-          history: 2w
-          trends: 0d
-          units: uptime
-          description: |
-            MIB: SNMPv2-MIB
-            The time (in hundredths of a second) since the network management portion of the system was last re-initialized.
-          preprocessing:
-            -
-              type: MULTIPLIER
-              parameters:
-                - '0.01'
-          tags:
-            -
-              tag: component
-              value: system
-          triggers:
-            -
-              uuid: 6b200163bfcd4899a82bcf98aa026aa2
-              expression: 'last(/D-Link DES 7200 SNMP/system.uptime[sysUpTime.0])<10m'
-              name: 'has been restarted'
-              event_name: '{HOST.NAME} has been restarted (uptime < 10m)'
-              priority: WARNING
-              description: 'Uptime is less than 10 minutes.'
-              manual_close: 'YES'
-              dependencies:
-                -
-                  name: 'No SNMP data collection'
-                  expression: 'max(/D-Link DES 7200 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
-              tags:
-                -
-                  tag: scope
-                  value: notice
-        -
           uuid: 4ca2130529464dc9ba9355a915c7e539
           name: 'SNMP agent availability'
           type: INTERNAL
@@ -2232,6 +2244,23 @@ zabbix_export:
             -
               value: '2'
               newvalue: unknown
+  triggers:
+    -
+      uuid: 6b200163bfcd4899a82bcf98aa026aa2
+      expression: '(last(/D-Link DES 7200 SNMP/system.hw.uptime[hrSystemUptime.0])>0 and last(/D-Link DES 7200 SNMP/system.hw.uptime[hrSystemUptime.0])<10m) or (last(/D-Link DES 7200 SNMP/system.hw.uptime[hrSystemUptime.0])=0 and last(/D-Link DES 7200 SNMP/system.net.uptime[sysUpTime.0])<10m)'
+      name: 'Host has been restarted'
+      event_name: '{HOST.NAME} has been restarted (uptime < 10m)'
+      priority: WARNING
+      description: 'Uptime is less than 10 minutes.'
+      manual_close: 'YES'
+      dependencies:
+        -
+          name: 'No SNMP data collection'
+          expression: 'max(/D-Link DES 7200 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+      tags:
+        -
+          tag: scope
+          value: notice
   graphs:
     -
       uuid: 7d05108847574098a7a15db5faf12b7c