Merge pull request zabbix#36 from tels7ar/gs110

Fix spelling of the word 'Octet'.
zhengyu-e365 · Feb 17, 2022 · c5c05f7 · c5c05f7
2 parents 1b92cc7 + 0ce3654
commit c5c05f7
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 39 deletions.
diff --git a/Network_Devices/Netgear/template_netgear_gs110tp/5.0/README.md b/Network_Devices/Netgear/template_netgear_gs110tp/5.0/README.md
@@ -34,7 +34,7 @@ There are no discovery rules in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Port 07 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.7<p>Update: 60</p>|
+|Port 07 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.7<p>Update: 60</p>|
 |Port 01 Status|<p>-</p>|`SNMP agent`|ifOperStatus.1<p>Update: 300</p>|
 |Port 04 Name|<p>-</p>|`SNMP agent`|ifName.4<p>Update: 3600</p>|
 |Port 10 Name|<p>-</p>|`SNMP agent`|ifName.10<p>Update: 3600</p>|
@@ -48,13 +48,13 @@ There are no discovery rules in this template.
 |Model|<p>-</p>|`SNMP agent`|model<p>Update: 86400</p>|
 |Port 03 Name|<p>-</p>|`SNMP agent`|ifName.3<p>Update: 3600</p>|
 |LAG 03 Traffic IN|<p>-</p>|`SNMP agent`|lag03.traffic.in<p>Update: 60</p>|
-|Port 06 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.6<p>Update: 60</p>|
+|Port 06 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.6<p>Update: 60</p>|
 |Uptime|<p>-</p>|`SNMP agent`|uptime<p>Update: 1800</p>|
 |Port 07 Status|<p>-</p>|`SNMP agent`|ifOperStatus.7<p>Update: 300</p>|
 |Port 05 Status|<p>-</p>|`SNMP agent`|ifOperStatus.5<p>Update: 300</p>|
 |Port 08 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.8<p>Update: 60</p>|
 |Port 05 Speed|<p>-</p>|`SNMP agent`|ifSpeed.5<p>Update: 14400</p>|
-|Port 02 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.2<p>Update: 60</p>|
+|Port 02 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.2<p>Update: 60</p>|
 |Port 01 Speed|<p>-</p>|`SNMP agent`|ifSpeed.1<p>Update: 14400</p>|
 |Port 01 Name|<p>-</p>|`SNMP agent`|ifName.1<p>Update: 3600</p>|
 |Location|<p>-</p>|`SNMP agent`|system.sysLocation.0<p>Update: 86400</p>|
@@ -64,27 +64,27 @@ There are no discovery rules in this template.
 |LAG 01 Traffic OUT|<p>-</p>|`SNMP agent`|lag01.traffic.out<p>Update: 60</p>|
 |LAG 02 Traffic OUT|<p>-</p>|`SNMP agent`|lag02.traffic.out<p>Update: 60</p>|
 |Port 06 Name|<p>-</p>|`SNMP agent`|ifName.6<p>Update: 3600</p>|
-|Port 03 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.3<p>Update: 60</p>|
+|Port 03 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.3<p>Update: 60</p>|
 |Port 03 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.3<p>Update: 60</p>|
 |Port 09 Status|<p>-</p>|`SNMP agent`|ifOperStatus.9<p>Update: 300</p>|
 |Software version|<p>-</p>|`SNMP agent`|software.version<p>Update: 14400</p>|
-|Port 01 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.1<p>Update: 60</p>|
+|Port 01 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.1<p>Update: 60</p>|
 |Port 04 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.4<p>Update: 60</p>|
-|Port 08 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.8<p>Update: 60</p>|
+|Port 08 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.8<p>Update: 60</p>|
 |Port 06 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.6<p>Update: 60</p>|
 |Port 02 Status|<p>-</p>|`SNMP agent`|ifOperStatus.2<p>Update: 300</p>|
 |MAC Address|<p>-</p>|`SNMP agent`|mac.address<p>Update: 86400</p>|
 |Port 09 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.9<p>Update: 60</p>|
-|Port 05 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.5<p>Update: 60</p>|
+|Port 05 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.5<p>Update: 60</p>|
 |LAG 02 Name|<p>-</p>|`SNMP agent`|lag.name.2<p>Update: 3600</p>|
-|Port 10 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.10<p>Update: 60</p>|
+|Port 10 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.10<p>Update: 60</p>|
 |Port 09 Speed|<p>-</p>|`SNMP agent`|ifSpeed.9<p>Update: 14400</p>|
 |Serial number|<p>-</p>|`SNMP agent`|serial.number<p>Update: 86400</p>|
 |LAG 03 Traffic OUT|<p>-</p>|`SNMP agent`|lag03.traffic.out<p>Update: 60</p>|
 |Port 07 Speed|<p>-</p>|`SNMP agent`|ifSpeed.7<p>Update: 14400</p>|
 |Port 10 Speed|<p>-</p>|`SNMP agent`|ifSpeed.10<p>Update: 14400</p>|
 |Port 10 Status|<p>-</p>|`SNMP agent`|ifOperStatus.10<p>Update: 300</p>|
-|Port 04 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.4<p>Update: 60</p>|
+|Port 04 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.4<p>Update: 60</p>|
 |LAG 01 Name|<p>-</p>|`SNMP agent`|lag.name.1<p>Update: 3600</p>|
 |System Name|<p>-</p>|`SNMP agent`|system.sysName.0<p>Update: 86400</p>|
 |Port 03 Speed|<p>-</p>|`SNMP agent`|ifSpeed.3<p>Update: 14400</p>|
@@ -94,7 +94,7 @@ There are no discovery rules in this template.
 |Port 07 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.7<p>Update: 60</p>|
 |Port 02 Name|<p>-</p>|`SNMP agent`|ifName.2<p>Update: 3600</p>|
 |LAG 01 Status|<p>-</p>|`SNMP agent`|lag01.status<p>Update: 300</p>|
-|Switch Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.switch<p>Update: 60</p>|
+|Switch Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.switch<p>Update: 60</p>|
 |Port 10 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.10<p>Update: 60</p>|
 |Port 08 Speed|<p>-</p>|`SNMP agent`|ifSpeed.8<p>Update: 14400</p>|
 |Port 05 Name|<p>-</p>|`SNMP agent`|ifName.5<p>Update: 3600</p>|
@@ -108,7 +108,7 @@ There are no discovery rules in this template.
 |LAG 04 Status|<p>-</p>|`SNMP agent`|lag04.status<p>Update: 300</p>|
 |Port 01 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.1<p>Update: 60</p>|
 |Port 02 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.2<p>Update: 60</p>|
-|Port 09 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.9<p>Update: 60</p>|
+|Port 09 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.9<p>Update: 60</p>|
 |LAG 04 Traffic OUT|<p>-</p>|`SNMP agent`|lag04.traffic.out<p>Update: 60</p>|
 ## Triggers
 

diff --git a/Network_Devices/Netgear/template_netgear_gs110tp/5.0/template_netgear_gs110tp.xml b/Network_Devices/Netgear/template_netgear_gs110tp/5.0/template_netgear_gs110tp.xml
diff --git a/Network_Devices/Netgear/template_netgear_gs110tp/5.4/README.md b/Network_Devices/Netgear/template_netgear_gs110tp/5.4/README.md
@@ -38,13 +38,13 @@ There are no discovery rules in this template.
 |Port 05 Speed|<p>-</p>|`SNMP agent`|ifSpeed.5<p>Update: 14400</p>|
 |LAG 01 Status|<p>-</p>|`SNMP agent`|lag01.status<p>Update: 300</p>|
 |Port 02 Speed|<p>-</p>|`SNMP agent`|ifSpeed.2<p>Update: 14400</p>|
-|Port 10 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.10<p>Update: 60</p>|
+|Port 10 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.10<p>Update: 60</p>|
 |Port 04 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.4<p>Update: 60</p>|
 |Port 08 Status|<p>-</p>|`SNMP agent`|ifOperStatus.8<p>Update: 300</p>|
 |Port 02 Name|<p>-</p>|`SNMP agent`|ifName.2<p>Update: 3600</p>|
 |LAG 03 Traffic IN|<p>-</p>|`SNMP agent`|lag03.traffic.in<p>Update: 60</p>|
-|Port 09 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.9<p>Update: 60</p>|
-|Port 06 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.6<p>Update: 60</p>|
+|Port 09 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.9<p>Update: 60</p>|
+|Port 06 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.6<p>Update: 60</p>|
 |Port 06 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.6<p>Update: 60</p>|
 |Port 07 Name|<p>-</p>|`SNMP agent`|ifName.7<p>Update: 3600</p>|
 |Port 02 Status|<p>-</p>|`SNMP agent`|ifOperStatus.2<p>Update: 300</p>|
@@ -58,14 +58,14 @@ There are no discovery rules in this template.
 |Port 09 Name|<p>-</p>|`SNMP agent`|ifName.9<p>Update: 3600</p>|
 |Port 10 Status|<p>-</p>|`SNMP agent`|ifOperStatus.10<p>Update: 300</p>|
 |LAG 04 Traffic OUT|<p>-</p>|`SNMP agent`|lag04.traffic.out<p>Update: 60</p>|
-|Port 08 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.8<p>Update: 60</p>|
+|Port 08 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.8<p>Update: 60</p>|
 |Port 05 Status|<p>-</p>|`SNMP agent`|ifOperStatus.5<p>Update: 300</p>|
 |Port 03 Status|<p>-</p>|`SNMP agent`|ifOperStatus.3<p>Update: 300</p>|
 |LAG 03 Traffic OUT|<p>-</p>|`SNMP agent`|lag03.traffic.out<p>Update: 60</p>|
 |Port 04 Name|<p>-</p>|`SNMP agent`|ifName.4<p>Update: 3600</p>|
 |Port 08 Name|<p>-</p>|`SNMP agent`|ifName.8<p>Update: 3600</p>|
 |Port 01 Status|<p>-</p>|`SNMP agent`|ifOperStatus.1<p>Update: 300</p>|
-|Port 03 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.3<p>Update: 60</p>|
+|Port 03 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.3<p>Update: 60</p>|
 |Port 07 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.7<p>Update: 60</p>|
 |Port 09 Status|<p>-</p>|`SNMP agent`|ifOperStatus.9<p>Update: 300</p>|
 |Port 01 Name|<p>-</p>|`SNMP agent`|ifName.1<p>Update: 3600</p>|
@@ -74,11 +74,11 @@ There are no discovery rules in this template.
 |LAG 01 Name|<p>-</p>|`SNMP agent`|lag.name.1<p>Update: 3600</p>|
 |Port 07 Speed|<p>-</p>|`SNMP agent`|ifSpeed.7<p>Update: 14400</p>|
 |Port 08 Speed|<p>-</p>|`SNMP agent`|ifSpeed.8<p>Update: 14400</p>|
-|Port 02 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.2<p>Update: 60</p>|
+|Port 02 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.2<p>Update: 60</p>|
 |LAG 04 Traffic IN|<p>-</p>|`SNMP agent`|lag04.traffic.in<p>Update: 60</p>|
 |Port 06 Speed|<p>-</p>|`SNMP agent`|ifSpeed.6<p>Update: 14400</p>|
 |Port 06 Name|<p>-</p>|`SNMP agent`|ifName.6<p>Update: 3600</p>|
-|Switch Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.switch<p>Update: 60</p>|
+|Switch Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.switch<p>Update: 60</p>|
 |Port 08 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.8<p>Update: 60</p>|
 |Port 06 Status|<p>-</p>|`SNMP agent`|ifOperStatus.6<p>Update: 300</p>|
 |LAG 01 Traffic OUT|<p>-</p>|`SNMP agent`|lag01.traffic.out<p>Update: 60</p>|
@@ -91,7 +91,7 @@ There are no discovery rules in this template.
 |Port 02 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.2<p>Update: 60</p>|
 |Port 10 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.10<p>Update: 60</p>|
 |Port 01 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.1<p>Update: 60</p>|
-|Port 07 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.7<p>Update: 60</p>|
+|Port 07 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.7<p>Update: 60</p>|
 |Port 03 Traffic OUT|<p>-</p>|`SNMP agent`|ifOutOctets.3<p>Update: 60</p>|
 |LAG 02 Name|<p>-</p>|`SNMP agent`|lag.name.2<p>Update: 3600</p>|
 |LAG 02 Traffic IN|<p>-</p>|`SNMP agent`|lag02.traffic.in<p>Update: 60</p>|
@@ -101,11 +101,11 @@ There are no discovery rules in this template.
 |Port 01 Speed|<p>-</p>|`SNMP agent`|ifSpeed.1<p>Update: 14400</p>|
 |Port 10 Speed|<p>-</p>|`SNMP agent`|ifSpeed.10<p>Update: 14400</p>|
 |Serial number|<p>-</p>|`SNMP agent`|serial.number<p>Update: 86400</p>|
-|Port 04 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.4<p>Update: 60</p>|
-|Port 05 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.5<p>Update: 60</p>|
+|Port 04 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.4<p>Update: 60</p>|
+|Port 05 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.5<p>Update: 60</p>|
 |MAC Address|<p>-</p>|`SNMP agent`|mac.address<p>Update: 86400</p>|
 |LAG 02 Status|<p>-</p>|`SNMP agent`|lag02.status<p>Update: 300</p>|
-|Port 01 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctects.1<p>Update: 60</p>|
+|Port 01 Traffic IN|<p>-</p>|`SNMP agent`|ifInOctets.1<p>Update: 60</p>|
 |LAG 03 Name|<p>-</p>|`SNMP agent`|lag.name.3<p>Update: 3600</p>|
 |LAG 04 Name|<p>-</p>|`SNMP agent`|lag.name.4<p>Update: 3600</p>|
 |Port 03 Speed|<p>-</p>|`SNMP agent`|ifSpeed.3<p>Update: 14400</p>|

diff --git a/Network_Devices/Netgear/template_netgear_gs110tp/5.4/template_netgear_gs110tp.yaml b/Network_Devices/Netgear/template_netgear_gs110tp/5.4/template_netgear_gs110tp.yaml
@@ -39,7 +39,7 @@ zabbix_export:
           name: 'Port 01 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.1
-          key: ifInOctects.1
+          key: ifInOctets.1
           delay: '60'
           history: 30d
           units: B/s
@@ -57,7 +57,7 @@ zabbix_export:
           name: 'Port 02 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.2
-          key: ifInOctects.2
+          key: ifInOctets.2
           delay: '60'
           history: 30d
           units: B/s
@@ -75,7 +75,7 @@ zabbix_export:
           name: 'Port 03 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.3
-          key: ifInOctects.3
+          key: ifInOctets.3
           delay: '60'
           history: 30d
           units: B/s
@@ -93,7 +93,7 @@ zabbix_export:
           name: 'Port 04 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.4
-          key: ifInOctects.4
+          key: ifInOctets.4
           delay: '60'
           history: 30d
           units: B/s
@@ -111,7 +111,7 @@ zabbix_export:
           name: 'Port 05 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.5
-          key: ifInOctects.5
+          key: ifInOctets.5
           delay: '60'
           history: 30d
           units: B/s
@@ -129,7 +129,7 @@ zabbix_export:
           name: 'Port 06 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.6
-          key: ifInOctects.6
+          key: ifInOctets.6
           delay: '60'
           history: 30d
           units: B/s
@@ -147,7 +147,7 @@ zabbix_export:
           name: 'Port 07 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.7
-          key: ifInOctects.7
+          key: ifInOctets.7
           delay: '60'
           history: 30d
           units: B/s
@@ -165,7 +165,7 @@ zabbix_export:
           name: 'Port 08 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.8
-          key: ifInOctects.8
+          key: ifInOctets.8
           delay: '60'
           history: 30d
           units: B/s
@@ -183,7 +183,7 @@ zabbix_export:
           name: 'Port 09 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.9
-          key: ifInOctects.9
+          key: ifInOctets.9
           delay: '60'
           history: 30d
           units: B/s
@@ -201,7 +201,7 @@ zabbix_export:
           name: 'Port 10 Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.10
-          key: ifInOctects.10
+          key: ifInOctets.10
           delay: '60'
           history: 30d
           units: B/s
@@ -219,7 +219,7 @@ zabbix_export:
           name: 'Switch Traffic IN'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.2.1.2.2.1.16.13
-          key: ifInOctects.switch
+          key: ifInOctets.switch
           delay: '60'
           history: 30d
           units: B/s
@@ -1360,7 +1360,7 @@ zabbix_export:
           color: 00C800
           item:
             host: Netgear_GS110TP
-            key: ifInOctects.switch
+            key: ifInOctets.switch
         -
           sortorder: '1'
           color: 0000DD
@@ -1377,7 +1377,7 @@ zabbix_export:
           yaxisside: RIGHT
           item:
             host: Netgear_GS110TP
-            key: ifInOctects.1
+            key: ifInOctets.1
         -
           sortorder: '1'
           drawtype: FILLED_REGION
@@ -1403,7 +1403,7 @@ zabbix_export:
           yaxisside: RIGHT
           item:
             host: Netgear_GS110TP
-            key: ifInOctects.2
+            key: ifInOctets.2
     -
       uuid: 9a1cb58baced4450a81ee1a11efa414b
       name: 'Port 03 Traffic'
@@ -1421,7 +1421,7 @@ zabbix_export:
           yaxisside: RIGHT
           item:
             host: Netgear_GS110TP
-            key: ifInOctects.3
+            key: ifInOctets.3
     -
       uuid: dce1e337f98542d3b1b7de4fe4a7e8b7
       name: 'Port 04 Traffic'
@@ -1439,4 +1439,4 @@ zabbix_export:
           yaxisside: RIGHT
           item:
             host: Netgear_GS110TP
-            key: ifInOctects.4
+            key: ifInOctets.4