Merge pull request zabbix#61 from mzmrk/patch-1

fixed Mikrotik-QUEUE template 6.0, deprecated $1 in discovery names
woutergd · Mar 30, 2022 · 2a46b2b · 2a46b2b
2 parents a9fb209 + dfc8bac
commit 2a46b2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Network_Devices/Mikrotik/template_mikrotik_queue_traffic_discovery/6.0/README.md b/Network_Devices/Mikrotik/template_mikrotik_queue_traffic_discovery/6.0/README.md
@@ -31,8 +31,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Queue $1 (IN)|<p>-</p>|`SNMP agent`|.1.3.6.1.4.1.14988.1.1.2.1.1.8[{#SNMPVALUE}]<p>Update: 60</p><p>LLD</p>|
-|Queue $1 (OUT)|<p>-</p>|`SNMP agent`|.1.3.6.1.4.1.14988.1.1.2.1.1.9[{#SNMPVALUE}]<p>Update: 60</p><p>LLD</p>|
+|Queue {#SNMPVALUE} (IN)|<p>-</p>|`SNMP agent`|.1.3.6.1.4.1.14988.1.1.2.1.1.8[{#SNMPVALUE}]<p>Update: 60</p><p>LLD</p>|
+|Queue {#SNMPVALUE} (OUT)|<p>-</p>|`SNMP agent`|.1.3.6.1.4.1.14988.1.1.2.1.1.9[{#SNMPVALUE}]<p>Update: 60</p><p>LLD</p>|
 
 
 ## Triggers

diff --git a/...plate_mikrotik_queue_traffic_discovery/6.0/template_mikrotik_queue_traffic_discovery.yaml b/...plate_mikrotik_queue_traffic_discovery/6.0/template_mikrotik_queue_traffic_discovery.yaml
@@ -38,7 +38,7 @@ zabbix_export:
           item_prototypes:
             -
               uuid: 8c2a30c33a9c47ae9e1cc29b7f9b3c7b
-              name: 'Queue $1 (IN)'
+              name: 'Queue {#SNMPVALUE} (IN)'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.14988.1.1.2.1.1.8.{#SNMPINDEX}'
               key: '.1.3.6.1.4.1.14988.1.1.2.1.1.8[{#SNMPVALUE}]'
@@ -59,7 +59,7 @@ zabbix_export:
                   value: Queues
             -
               uuid: dbabb92e1696448fac11e67f5892fa94
-              name: 'Queue $1 (OUT)'
+              name: 'Queue {#SNMPVALUE} (OUT)'
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.14988.1.1.2.1.1.9.{#SNMPINDEX}'
               key: '.1.3.6.1.4.1.14988.1.1.2.1.1.9[{#SNMPVALUE}]'